diff --git a/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl b/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl
index c14fd9dc3e..56d568aa68 100644
--- a/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl
@@ -118,7 +118,6 @@
 
 <nav id="mainMenu">
 <div class="menuContent">
-<<<<<<< HEAD
 	<div class="container">
 	  <ul class="hidden-md hidden-lg">
 	   <li> <span class="glyphicon glyphicon-menu-hamburger"></span> <span class="menuContentTitle">Main menu</span>
@@ -130,19 +129,6 @@
 	  <ul class="visible-md-block visible-lg-block visible-ul">
 	    [@mainMenuList /]
 	  </ul>
-=======
-  <div class="container">
-    <ul class="hidden-md hidden-lg">
-     <li> <span class="glyphicon glyphicon-menu-hamburger"></span> Main menu
-       <ul class="subMenu">
-         [@mainMenuList /]
-       </ul>
-     </li>
-    </ul>
-    <ul class="visible-md-block visible-lg-block visible-ul">
-      [@mainMenuList /]
-    </ul>
->>>>>>> aiccra-tip-migrations
 
     [#if logged?? && logged]
       <div id="userInfo">