settling the conflict Synonym