Merge conflict changes