diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index c42dc67aa4..6eaaa28ade 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -535,8 +535,12 @@ EditorRoutes::redisplay ()
         
 		/* show or hide the TimeAxisView */
 		if (visible) {
+<<<<<<< HEAD
 			position += tv->show_at (position, n, &_editor->edit_controls_vbox, show_number);
 			// SHOWTRACKS
+=======
+			position += tv->show_at (position, n, &_editor->edit_controls_vbox);
+>>>>>>> 5d6dc38... fix some confusion when redrawing editor/mixer track/strip displays after track/bus deletion
 		} else {
 			tv->hide ();
 		}