fix conflict

app/views/layouts/_menu.html.erb

@@ -8,7 +8,7 @@
     </ul>
     </ul>
     <!-- check an user is logged in or not -->
     <!-- check an user is logged in or not -->
     <ul class="nav navbar-nav navbar-right">
     <ul class="nav navbar-nav navbar-right">
-      <%- if current_user -%> my_pages
+      <%- if current_user -%>
       <li>
       <li>
         <%= link_to my_my_pages_path do %>
         <%= link_to my_my_pages_path do %>
           <i class="fa fa-user" aria-hidden="true"></i> My Page
           <i class="fa fa-user" aria-hidden="true"></i> My Page
@@ -26,31 +26,21 @@
         <% end %>
         <% end %>
       </li>
       </li>
       <li>
       <li>
-<<<<<<< 28961f125c2471f7b2c147015938987727aa3193
-        <%= link_to new_user_session_path do %>
-          <i class="fa fa-sign-in" aria-hidden="true"></i> Login
-=======
         <%= link_to register_path(step: 1) do %>
         <%= link_to register_path(step: 1) do %>
           <i class="fa fa-plus-circle" aria-hidden="true"></i> Register
           <i class="fa fa-plus-circle" aria-hidden="true"></i> Register
->>>>>>> update link to download cv my page
         <% end %>
         <% end %>
       </li>
       </li>
       <%- end -%>
       <%- end -%>
-<<<<<<< 2bb315a626e08b91ef63909403c9791c9db5b2b1
       <li>
       <li>
         <%= link_to favorites_path do %> Favorite
         <%= link_to favorites_path do %> Favorite
           <i class="fa fa-star" aria-hidden="true"></i>
           <i class="fa fa-star" aria-hidden="true"></i>
         <% end %>
         <% end %>
       </li>
       </li>
-      <li><a href="#"><i class="fa fa-history" aria-hidden="true"></i></span> History</a></li>
-=======
-      <li><a href="#"><i class="fa fa-star" aria-hidden="true"></i></span> Favorite</a></li>
       <li>
       <li>
         <%= link_to history_my_pages_path do %>
         <%= link_to history_my_pages_path do %>
           <i class="fa fa-history" aria-hidden="true"></i> History
           <i class="fa fa-history" aria-hidden="true"></i> History
         <% end %>
         <% end %>
       </li>
       </li>
->>>>>>> add history page
     </ul>
     </ul>
   </div>
   </div>
 </nav>
 </nav>