merge fix

diff --cc gtk2_ardour/audio_region_view.cc
Simple merge

diff --cc gtk2_ardour/editor_canvas.cc
Simple merge

diff --cc gtk2_ardour/editor_drag.cc
Simple merge

diff --cc gtk2_ardour/editor_drag.h
Simple merge

diff --cc gtk2_ardour/editor_ops.cc
index 2d26a90a86ce5362886b06cff6c1a450dc38860a,14c6f9123705227914f510e7bfa9c46de5a76864..50b7c81b44128f4a9de9c4f0e18f08f6dbf8c8cf
--- 1/gtk2_ardour/editor_ops.cc
--- 2/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@@ -7107,11 -7322,9 +7301,9 @@@ Editor::do_remove_time (
  }
  
  void
 -Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, 
 -                   bool ignore_music_glue, bool markers_too, bool tempo_too)
 +Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, 
 +                   bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too)
  {
-       bool commit = false;
-       
        if (Config->get_edit_mode() == Lock) {
                error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg;
                return;

diff --cc gtk2_ardour/editor_selection.cc
Simple merge