committing conflict changes