fixing the conflict Synonym