Resolve view conflicts

app/views/help/index.html.haml

 %div
-- if current_application_settings.help_page_text.present?
-  = markdown_field(current_application_settings, :help_page_text)
+- if current_application_settings.help_text.present?
+  = markdown(current_application_settings.help_text)
   %hr
 
 - unless current_application_settings.help_page_hide_commercial_content?
@@ -12,33 +12,19 @@
       %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
       - if current_application_settings.version_check_enabled
         = version_status_badge
-  %br
-    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}.
-<<<<<<< HEAD
-  - if current_application_settings.help_text.present?
-    %hr
-    %p.slead
-      = markdown(current_application_settings.help_text)
-  - else
   %p.slead
     GitLab is open source software to collaborate on code.
     %br
-      Manage git repositories with fine grained access controls that keep your code secure.
+    Manage git repositories with fine-grained access controls that keep your code secure.
     %br
     Perform code reviews and enhance collaboration with merge requests.
     %br
     Each project can also have an issue tracker and a wiki.
     %br
     Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
-
-    - if current_application_settings.help_page_text.present?
-      %hr
-      = markdown_field(current_application_settings, :help_page_text)
-
-%hr
-=======
+    %br
+    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}.
   %hr
->>>>>>> ce/master
 
 .row.prepend-top-default
   .col-md-8

app/views/layouts/_broadcast.html.haml

-<<<<<<< HEAD
-= broadcast_message
-
 - if license_message.present?
   .broadcast-message
     = icon('bullhorn')
     = license_message
-=======
+
 - BroadcastMessage.current.each do |message|
   = broadcast_message(message)
->>>>>>> ce/master
+

app/views/projects/boards/components/_board.html.haml

@@ -10,11 +10,7 @@
           data: { container: "body", placement: "bottom" } }
           {{ list.title }}
         .issue-count-badge.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' }
-<<<<<<< HEAD
-          %span.issue-count-badge-count{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
-=======
           %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
->>>>>>> ce/master
             {{ list.issuesSize }}
           - if can?(current_user, :admin_issue, @project)
             %button.issue-count-badge-add-button.btn.btn-small.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button",

app/views/projects/jobs/_sidebar.html.haml

@@ -36,47 +36,6 @@
               = link_to browse_namespace_project_job_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
                 Browse
 
-<<<<<<< HEAD
-    .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) }
-      .title
-        Job details
-        - if can?(current_user, :update_build, @build) && @build.retryable?
-          = link_to "Retry job", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
-      - if @build.merge_request
-        %p.build-detail-row
-          %span.build-light-text Merge Request:
-          = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request), class: 'bold'
-      - if @build.duration
-        %p.build-detail-row
-          %span.build-light-text Duration:
-          = time_interval_in_words(@build.duration)
-      - if @build.finished_at
-        %p.build-detail-row
-          %span.build-light-text Finished:
-          #{time_ago_with_tooltip(@build.finished_at)}
-      - if @build.erased_at
-        %p.build-detail-row
-          %span.build-light-text Erased:
-          #{time_ago_with_tooltip(@build.erased_at)}
-      %p.build-detail-row
-        %span.build-light-text Runner:
-        - if @build.runner && current_user && current_user.admin
-          = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
-        - elsif @build.runner
-          \##{@build.runner.id}
-      .btn-group.btn-group-justified{ role: :group }
-        - if @build.has_trace?
-          = link_to 'Raw', raw_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default'
-        - if @build.active?
-          = link_to "Cancel", cancel_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
-        - if can?(current_user, :update_build, @project) && @build.erasable?
-          = link_to erase_namespace_project_job_path(@project.namespace, @project, @build),
-                    class: "btn btn-sm btn-default", method: :post,
-                    data: { confirm: "Are you sure you want to erase this build?" } do
-            Erase
-
-=======
->>>>>>> ce/master
     - if @build.trigger_request
       .build-widget
         %h4.title