Resolve conflict in issues show with related issues

app/views/projects/issues/show.html.haml

@@ -77,7 +77,6 @@
 
       = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago')
 
-<<<<<<< HEAD
     - if can?(current_user, :read_issue_link, @project)
       .js-related-issues-root{ data: { endpoint: project_issue_links_path(@project, @issue),
         can_add_related_issues: "#{can?(current_user, :admin_issue_link, @issue)}",
@@ -88,9 +87,6 @@
               %h3.panel-title
                 Related issues
 
-
-=======
->>>>>>> upstream/master
     #merge-requests{ data: { url: referenced_merge_requests_project_issue_path(@project, @issue) } }
       // This element is filled in using JavaScript.