Fix views conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -18,7 +18,6 @@
     :javascript
       window.gl.mrWidgetData = #{serialize_issuable(@merge_request)}
 
-<<<<<<< HEAD
       // Append static, server-generated data not included in merge request entity (EE-Only)
       // Object.assign would be useful here, but it blows up Phantom.js in tests
       window.gl.mrWidgetData.is_geo_secondary_node = '#{Gitlab::Geo.secondary?}' === 'true';
@@ -27,10 +26,6 @@
 
     #js-vue-mr-widget.mr-widget
 
-=======
-    #js-vue-mr-widget.mr-widget
-
->>>>>>> upstream/master
     - content_for :page_specific_javascripts do
       = page_specific_javascript_bundle_tag('vue_merge_request_widget')
 

app/views/shared/issuable/form/_merge_params.html.haml

@@ -5,7 +5,6 @@
 
 -# This check is duplicated below, to avoid conflicts with EE.
 - return unless issuable.can_remove_source_branch?(current_user)
-<<<<<<< HEAD
 
 .form-group
   .col-sm-10.col-sm-offset-2
@@ -15,5 +14,3 @@
         = check_box_tag 'merge_request[squash]', '1', issuable.squash
         Squash commits when merge request is accepted.
         = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
-=======
->>>>>>> upstream/master