[CE->EE] Fix last part of the conflicts

app/views/help/index.html.haml

@@ -5,11 +5,10 @@
     - if user_signed_in?
       %span= Gitlab::VERSION
       %small= Gitlab::REVISION
-<<<<<<< HEAD
       - if current_application_settings.version_check_enabled
         = version_status_badge
   %br
-    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank'}.
+    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}.
   - if current_application_settings.help_text.present?
     %hr
     %p.slead
@@ -26,21 +25,6 @@
       %br
       Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
 
-=======
-      = version_status_badge
-  %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.
-    %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.
-    %br
-    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}.
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     - if current_application_settings.help_page_text.present?
       %hr
       = markdown_field(current_application_settings, :help_page_text)

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

@@ -22,20 +22,9 @@
       .nav-controls
         = 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')
-        - if can? current_user, :create_issue, @project
-          = link_to new_namespace_project_issue_path(@project.namespace,
-                                                     @project,
-                                                     issue: { assignee_id: issues_finder.assignee.try(:id),
-                                                              milestone_id: issues_finder.milestones.first.try(:id) }),
-                                                     class: "btn btn-new",
-                                                     title: "New Issue",
-                                                     id: "new_issue_link" do
-            New Issue
-=======
         = link_to new_namespace_project_issue_path(@project.namespace,
                                                    @project,
                                                    issue: { assignee_id: issues_finder.assignee.try(:id),
@@ -44,7 +33,6 @@
                                                    title: "New Issue",
                                                    id: "new_issue_link" do
           New Issue
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     = render 'shared/issuable/search_bar', type: :issues
 
     .issues-holder