Fix last remaining conflict

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/commits/_head.html.haml

@@ -23,18 +23,11 @@
           = link_to namespace_project_branches_path(@project.namespace, @project) do
             Branches
 
-<<<<<<< HEAD
       = nav_link(controller: [:tags, :releases]) do
         = link_to namespace_project_tags_path(@project.namespace, @project) do
           Tags
+
       - if license_allows_file_locks?
         = nav_link(controller: [:path_locks]) do
           = link_to namespace_project_path_locks_path(@project.namespace, @project) do
             Locked Files
-
-      .fade-right
-=======
-        = nav_link(controller: [:tags, :releases]) do
-          = link_to namespace_project_tags_path(@project.namespace, @project) do
-            Tags
->>>>>>> ce/master