ending a conflict Synonym