resolve the conflict Synonym