Fix merge conflicts in views

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

@@ -36,14 +36,12 @@
              
             - issue.labels.each do |label|
               = link_to_label(label, subject: issue.project, css_class: 'label-link')
-<<<<<<< HEAD
+
           - if issue.weight
             %span.issuable-weight
               &nbsp;
               = icon('balance-scale')
               = issue.weight
-=======
->>>>>>> ce/master
 
       .issuable-meta
         %ul.controls

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

@@ -24,11 +24,7 @@
         - if @can_bulk_update
           = button_tag "Edit Merge Requests", class: "btn js-bulk-update-toggle"
         - if merge_project
-<<<<<<< HEAD
-          = link_to namespace_project_new_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New merge request" do
-=======
           = link_to new_merge_request_path, class: "btn btn-new", title: "New merge request" do
->>>>>>> ce/master
             New merge request
 
     = render 'shared/issuable/search_bar', type: :merge_requests

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

@@ -5,10 +5,7 @@
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('common_vue')
   = page_specific_javascript_bundle_tag('diff_notes')
-<<<<<<< HEAD
   = webpack_bundle_tag('issuable')
-=======
->>>>>>> ce/master
 
 .merge-request{ 'data-url' => merge_request_path(@merge_request, format: :json), 'data-project-path' => project_path(@merge_request.project) }
   = render "projects/merge_requests/mr_title"
@@ -22,7 +19,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';
@@ -30,8 +26,6 @@
       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")}';
 
-=======
->>>>>>> ce/master
     #js-vue-mr-widget.mr-widget
 
     - content_for :page_specific_javascripts do