Change conflicting version