Resolve conflicts in _label_row

app/views/shared/_label_row.html.haml

 - subject = local_assigns[:subject]
 - force_priority = local_assigns.fetch(:force_priority, false)
-<<<<<<< HEAD
 - show_label_epics_link = @group&.feature_available?(:epics)
-=======
->>>>>>> upstream/master
 - show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project)
 - show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project)
 
@@ -15,7 +12,6 @@
       .description-text.append-bottom-10
         = markdown_field(label, :description)
     %ul.label-links
-<<<<<<< HEAD
       - if show_label_epics_link
         %li.label-link-item.inline
           = link_to 'Epics', group_epics_path(@group, label_name:[label.name])
@@ -28,15 +24,6 @@
         %li.label-link-item.inline
           = link_to_label(label, subject: subject, type: :merge_request) { _('Merge requests') }
           &middot;
-=======
-      - if show_label_issues_link
-        %li.label-link-item.inline
-          = link_to_label(label, subject: subject) { 'Issues' }
-      - if show_label_merge_requests_link
-        &middot;
-        %li.label-link-item.inline
-          = link_to_label(label, subject: subject, type: :merge_request) { _('Merge requests') }
->>>>>>> upstream/master
       - if force_priority
         %li.label-link-item.js-priority-badge.inline.prepend-left-10
           .label-badge.label-badge-blue= _('Prioritized label')