diff --git a/app/views/canvas/edit/modal/_move_module_group.html.erb b/app/views/canvas/edit/modal/_move_module_group.html.erb
index a0352aadf..b36efc9bf 100644
--- a/app/views/canvas/edit/modal/_move_module_group.html.erb
+++ b/app/views/canvas/edit/modal/_move_module_group.html.erb
@@ -23,15 +23,10 @@
         <% end %>
       </div>
       <div class="modal-footer">
-<<<<<<< HEAD
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
-        <% if experiments.count > 1 %>
-          <button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module_group.confirm" %></button>
-      <% end %>
-=======
+      <% if experiments.count > 1 %>
         <button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module_group.confirm" %></button>
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
->>>>>>> ml_sci_395
+      <button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
+      <% end %>
       </div>
     </div>
   </div>