Fix admin nav merge conflict

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

 .scrolling-tabs-container{ class: nav_control_class }
   = render 'layouts/nav/admin_settings'
   .fade-left
-<<<<<<< HEAD
-  = nav_link(controller: %w(dashboard admin projects users groups builds), html_options: {class: 'home'}) do
-    = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
-      %span
-        Overview
-  = nav_link(controller: %w(background_jobs logs health_check)) do
-    = link_to admin_background_jobs_path, title: 'Monitoring' do
-      %span
-        Monitoring
-  = nav_link(controller: :deploy_keys) do
-    = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
-      %span
-        Deploy Keys
-  = nav_link path: ['runners#index', 'runners#show'] do
-    = link_to admin_runners_path, title: 'Runners' do
-      %span
-        Runners
-  = nav_link(controller: :broadcast_messages) do
-    = link_to admin_broadcast_messages_path, title: 'Messages' do
-      %span
-        Messages
-  = nav_link(controller: :hooks) do
-    = link_to admin_hooks_path, title: 'Hooks' do
-      %span
-        Hooks
-  = nav_link(controller: :git_hooks) do
-    = link_to admin_git_hooks_path, title: 'Git Hooks' do
-      %span
-        Git Hooks
-  = nav_link(controller: :appearances) do
-    = link_to admin_appearances_path, title: 'Appearances' do
-      %span
-        Appearance
-
-  = nav_link(controller: :applications) do
-    = link_to admin_applications_path, title: 'Applications' do
-      %span
-        Applications
-
-  = nav_link(controller: :services) do
-    = link_to admin_application_settings_services_path, title: 'Service Templates' do
-      %span
-        Service Templates
-
-  = nav_link(controller: :labels) do
-    = link_to admin_labels_path, title: 'Labels' do
-      %span
-        Labels
-
-  = nav_link(controller: :geo_nodes) do
-    = link_to admin_geo_nodes_path, title: 'Geo Nodes' do
-      %span
-        Geo Nodes
-
-  = nav_link(controller: :abuse_reports) do
-    = link_to admin_abuse_reports_path, title: "Abuse Reports" do
-      %span
-        Abuse Reports
-        %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
-=======
     = icon('arrow-left')
   .fade-right
     = icon('arrow-right')
@@ -69,14 +9,17 @@
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
         %span
           Overview
+
     = nav_link(controller: %w(background_jobs logs health_check)) do
       = link_to admin_background_jobs_path, title: 'Monitoring' do
         %span
           Monitoring
+
     = nav_link(controller: :broadcast_messages) do
       = link_to admin_broadcast_messages_path, title: 'Messages' do
         %span
           Messages
+
     = nav_link(controller: :hooks) do
       = link_to admin_hooks_path, title: 'Hooks' do
         %span
@@ -86,7 +29,6 @@
       = link_to admin_applications_path, title: 'Applications' do
         %span
           Applications
->>>>>>> 0115ab7f403e7b25a7e66c3f4c309ddd5f37d657
 
     = nav_link(controller: :abuse_reports) do
       = link_to admin_abuse_reports_path, title: "Abuse Reports" do
@@ -94,21 +36,23 @@
           Abuse Reports
           %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
 
-<<<<<<< HEAD
-  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
-    = link_to admin_application_settings_path, title: 'Settings' do
-      %span
-        Settings
+    = nav_link(controller: :licenses) do
+      = link_to admin_license_path, title: 'License' do
+        %span
+          License
 
-  = nav_link(controller: :licenses) do
-    = link_to admin_license_path, title: 'License' do
-      %span
-        License
-  .fade-right
-=======
     - if askimet_enabled?
       = nav_link(controller: :spam_logs) do
         = link_to admin_spam_logs_path, title: "Spam Logs" do
           %span
             Spam Logs
->>>>>>> 0115ab7f403e7b25a7e66c3f4c309ddd5f37d657
+
+    = nav_link(controller: :git_hooks) do
+      = link_to admin_git_hooks_path, title: 'Git Hooks' do
+        %span
+          Git Hooks
+
+    = nav_link(controller: :geo_nodes) do
+      = link_to admin_geo_nodes_path, title: 'Geo Nodes' do
+        %span
+          Geo Nodes