made conflict changes