settle the conflict Synonym