wrapping up the conflict Synonym