modifying conflict changes