resolved conflict changes