conflict changes