Resolve conflict in project settings dropdown

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/layouts/nav/_project_settings.html.haml

@@ -4,62 +4,7 @@
       %span
         Members
 
-<<<<<<< HEAD
-  %li.separate-item
 
-  %ul.sidebar-subnav
-    = nav_link(path: 'projects#edit') do
-      = link_to edit_project_path(@project), title: 'Project Settings' do
-        = icon('pencil-square-o fw')
-        %span
-          Project Settings
-    - if @project.allowed_to_share_with_group?
-      = nav_link(controller: :group_links) do
-        = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
-          = icon('share-square-o fw')
-          %span
-            Groups
-    = nav_link(controller: :deploy_keys) do
-      = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
-        = icon('key fw')
-        %span
-          Deploy Keys
-    = nav_link(controller: :hooks) do
-      = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
-        = icon('link fw')
-        %span
-          Webhooks
-    = nav_link(controller: :git_hooks) do
-      = link_to namespace_project_git_hooks_path(@project.namespace, @project), title: "Git Hooks" do
-        = icon('git-square fw')
-        %span
-          Git Hooks
-    = nav_link(controller: :services) do
-      = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
-        = icon('cogs fw')
-        %span
-          Services
-    = nav_link(controller: :protected_branches) do
-      = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
-        = icon('lock fw')
-        %span
-          Protected Branches
-    = nav_link(controller: :mirrors) do
-      = link_to namespace_project_mirror_path(@project.namespace, @project), title: 'Mirror Repository', data: {placement: 'right'} do
-        = icon('clone fw')
-        %span
-          Mirror Repository
-    = nav_link(controller: :pages) do
-      = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages', data: {placement: 'right'} do
-        = icon('cloud-upload fw')
-        %span
-          Pages
-    = nav_link(controller: :audit_events) do
-      = link_to namespace_project_audit_events_path(@project.namespace, @project), title: "Audit Events" do
-        = icon('file-text-o fw')
-        %span
-          Audit Events
-=======
 - if @project.allowed_to_share_with_group?
   = nav_link(controller: :group_links) do
     = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
@@ -81,7 +26,7 @@
   = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
     %span
       Protected Branches
->>>>>>> e6389dfee621090706d43d3107339934ca42f0ff
+
 
 - if @project.builds_enabled?
   = nav_link(controller: :runners) do
@@ -100,3 +45,20 @@
     = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
       %span
         Badges
+
+= nav_link(controller: :git_hooks) do
+  = link_to namespace_project_git_hooks_path(@project.namespace, @project), title: "Git Hooks" do
+    %span
+      Git Hooks
+= nav_link(controller: :mirrors) do
+  = link_to namespace_project_mirror_path(@project.namespace, @project), title: 'Mirror Repository', data: {placement: 'right'} do
+    %span
+      Mirror Repository
+= nav_link(controller: :pages) do
+  = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages', data: {placement: 'right'} do
+    %span
+      Pages
+= nav_link(controller: :audit_events) do
+  = link_to namespace_project_audit_events_path(@project.namespace, @project), title: "Audit Events" do
+    %span
+      Audit Events