Resolve conflicts in group sidebar

app/views/layouts/nav/sidebar/_group.html.haml

@@ -107,11 +107,7 @@
               %strong.fly-out-top-item-name
                 #{ _('Members') }
       - if current_user && can?(current_user, :admin_group, @group)
-<<<<<<< HEAD
-        = nav_link(path: %w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
-=======
         = nav_link(path: group_nav_link_paths) do
->>>>>>> upstream/master
           = link_to edit_group_path(@group) do
             .nav-icon-container
               = sprite_icon('settings')