Fix merge conflicts from CE upstream

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

@@ -14,11 +14,7 @@
         .sidebar-context-title
           = @group.name
     %ul.sidebar-top-level-items
-<<<<<<< HEAD
       = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
-=======
-      = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
->>>>>>> ce-com/master
         = link_to group_path(@group) do
           .nav-icon-container
             = custom_icon('project')
@@ -41,7 +37,6 @@
               %span
                 Activity
 
-<<<<<<< HEAD
           - if @group.feature_available?(:contribution_analytics) || show_promotions?
             = nav_link(path: 'analytics#show') do
               = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
@@ -49,9 +44,6 @@
                   Contribution Analytics
 
       = nav_link(path: issues_sub_menu_items) do
-=======
-      = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do
->>>>>>> ce-com/master
         = link_to issues_group_path(@group) do
           .nav-icon-container
             = custom_icon('issues')
@@ -112,11 +104,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: %w[groups#projects groups#edit ci_cd#show]) do
->>>>>>> ce-com/master
           = link_to edit_group_path(@group) do
             .nav-icon-container
               = custom_icon('settings')