Resolve conflicts

app/helpers/system_note_helper.rb

@@ -19,15 +19,11 @@ module SystemNoteHelper
     'discussion' => 'comment',
     'moved' => 'arrow-right',
     'outdated' => 'pencil',
-<<<<<<< HEAD
     'duplicate' => 'issue-duplicate',
     'approved' => 'approval',
     'unapproved' => 'unapproval',
     'relate' => 'link',
     'unrelate' => 'unlink'
-=======
-    'duplicate' => 'issue-duplicate'
->>>>>>> upstream/master
   }.freeze
 
   def system_note_icon_name(note)

app/views/shared/boards/_show.html.haml

@@ -36,7 +36,6 @@
       ":board-id" => "boardId",
       ":key" => "_uid" }
   = render "shared/boards/components/sidebar"
-<<<<<<< HEAD
   - if @project
     %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
       "milestone-path" => milestones_filter_dropdown_path,
@@ -45,12 +44,3 @@
       ":issue-link-base" => "issueLinkBase",
       ":root-path" => "rootPath",
       ":project-id" => @project.try(:id) }
-=======
-  %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
-    "milestone-path" => milestones_filter_dropdown_path,
-    "label-path" => labels_filter_path,
-    "empty-state-svg" => image_path('illustrations/issues.svg'),
-    ":issue-link-base" => "issueLinkBase",
-    ":root-path" => "rootPath",
-    ":project-id" => @project.try(:id) }
->>>>>>> upstream/master

config/webpack.config.js

@@ -47,11 +47,8 @@ var config = {
     groups:               './groups/index.js',
     groups_list:          './groups_list.js',
     help:                 './help/help.js',
-<<<<<<< HEAD
     issuable:             './issuable/issuable_bundle.js',
     issues:               './issues/issues_bundle.js',
-=======
->>>>>>> upstream/master
     how_to_merge:         './how_to_merge.js',
     issue_show:           './issue_show/index.js',
     integrations:         './integrations',