diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb
index 7d4f320c3..279a8a7d3 100644
--- a/app/assets/javascripts/protocols/steps.js.erb
+++ b/app/assets/javascripts/protocols/steps.js.erb
@@ -185,12 +185,8 @@ function formCallback($form) {
 
     setTimeout(function() {
       initStepsComments();
-<<<<<<< HEAD
-      openLinksInNewTab();
       animateSpinner(null, false);
-=======
       SmartAnnotation.preventPropagation('.atwho-user-popover');
->>>>>>> smart-annotations
     }, 1000);
     return true;
   });
@@ -281,12 +277,10 @@ function formNewAjax($form) {
     formCallback($form);
     formNewAjax($form);
     applyCancelOnNew();
-<<<<<<< HEAD
     animateSpinner(null, false);
-=======
+
     TinyMCE.destroyAll();
     SmartAnnotation.preventPropagation('.atwho-user-popover');
->>>>>>> smart-annotations
   });
 }
 
diff --git a/app/views/projects/index/_org_projects.html.erb b/app/views/projects/index/_team_projects.html.erb
similarity index 100%
rename from app/views/projects/index/_org_projects.html.erb
rename to app/views/projects/index/_team_projects.html.erb