Resolve conflict in app/views/projects/merge_requests/show.html.haml

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

@@ -29,11 +29,8 @@
       window.gl.mrWidgetData.enable_squash_before_merge = '#{@merge_request.project.feature_available?(:merge_request_squash)}' === 'true';
       window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}';
 
-<<<<<<< HEAD
     #js-vue-mr-widget.mr-widget
 
-=======
->>>>>>> upstream/master
     .content-block.content-block-small.emoji-list-container
       = render 'award_emoji/awards_block', awardable: @merge_request, inline: true