ending the conflict Synonym