Fix conflict in app/views/layouts/nav/sidebar/_admin.html.haml

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

@@ -135,7 +135,6 @@
               %strong.fly-out-top-item-name
                 #{ _('Abuse Reports') }
               %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
-<<<<<<< HEAD
 
       = nav_link(controller: :licenses) do
         = link_to admin_license_path do
@@ -148,8 +147,6 @@
             = link_to admin_license_path do
               %strong.fly-out-top-item-name
                 #{ _('License') }
-=======
->>>>>>> gitlab-ce/master
 
       - if akismet_enabled?
         = nav_link(controller: :spam_logs) do