Fix nav/group conflict

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

@@ -30,11 +30,7 @@
           %span
             Contribution Analytics
     - if current_user && can?(current_user, :admin_group, @group)
-<<<<<<< HEAD
       = nav_link(path: %w[groups#projects groups#edit 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), title: 'Settings' do
           %span
             Settings