Resolve conflicts in view files

app/views/layouts/nav/_admin.html.haml

@@ -9,13 +9,8 @@
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
         %span
           Overview
-<<<<<<< HEAD
-    = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles audit_logs)) do
-      = link_to admin_system_info_path, title: 'Monitoring' do
-=======
-    = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do
+    = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
       = link_to admin_conversational_development_index_path, title: 'Monitoring' do
->>>>>>> ce/master
         %span
           Monitoring
 

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

@@ -23,12 +23,9 @@
       .nav-controls.inline
         = link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
           = icon('rss')
-<<<<<<< HEAD
         - if current_user
           %button.csv_download_link.btn.append-right-10.has-tooltip{ title: 'Export as CSV' }
             = icon('download')
-=======
->>>>>>> ce/master
         - if @can_bulk_update
           = button_tag "Edit Issues", class: "btn btn-default js-bulk-update-toggle"
         = link_to new_namespace_project_issue_path(@project.namespace,

app/views/projects/settings/repository/show.html.haml

@@ -6,13 +6,9 @@
   = page_specific_javascript_bundle_tag('common_vue')
   = page_specific_javascript_bundle_tag('deploy_keys')
 
-<<<<<<< HEAD
-= render @deploy_keys
 = render "projects/push_rules/index"
 = render "projects/mirrors/show"
 
-=======
->>>>>>> ce/master
 = render "projects/protected_branches/index"
 = render "projects/protected_tags/index"
 = render @deploy_keys

app/views/shared/issuable/_search_bar.html.haml

@@ -96,7 +96,6 @@
                     %span.dropdown-label-box{ style: 'background: {{color}}' }
                     %span.label-title.js-data-value
                       {{title}}
-<<<<<<< HEAD
 
             - if type == :issues || type == :boards || type == :boards_modal
               #js-dropdown-weight.filtered-search-input-dropdown-menu.dropdown-menu
@@ -113,10 +112,8 @@
                     %li.filter-dropdown-item{ 'data-value' => "#{weight}" }
                       %button.btn.btn-link= weight
 
-=======
           %button.clear-search.hidden{ type: 'button' }
             = icon('times')
->>>>>>> ce/master
         .filter-dropdown-container
           - if type == :boards
             - if can?(current_user, :admin_list, @project)
@@ -130,11 +127,7 @@
                   = dropdown_loading
               #js-add-issues-btn.prepend-left-10
           - elsif type != :boards_modal
-<<<<<<< HEAD
             = render 'shared/sort_dropdown', type: local_assigns[:type]
-=======
-            = render 'shared/sort_dropdown'
->>>>>>> ce/master
 
 - unless type === :boards_modal
   :javascript