fix the conflict Synonym