Resolve GitLab QA merge conflicts / Thursday

app/views/layouts/header/_default.html.haml

-<<<<<<< HEAD
 %header.navbar.navbar-gitlab.navbar-gitlab-new.qa-navbar
-=======
-%header.navbar.navbar-gitlab.qa-navbar
->>>>>>> upstream/master
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
     .header-content

qa/qa/page/menu/admin.rb

@@ -9,13 +9,10 @@ module QA
         #
         view 'app/views/admin/dashboard/index.html.haml'
 
-<<<<<<< HEAD
         def go_to_geo_nodes
           click_link 'Geo Nodes'
         end
 
-=======
->>>>>>> upstream/master
         def go_to_license
           click_link 'License'
         end

qa/qa/scenario/test/sanity/selectors.rb

@@ -5,11 +5,7 @@ module QA
         class Selectors < Scenario::Template
           include Scenario::Bootable
 
-<<<<<<< HEAD
           PAGES = [QA::Page, QA::EE::Page].freeze
-=======
-          PAGES = [QA::Page].freeze
->>>>>>> upstream/master
 
           def perform(*)
             validators = PAGES.map do |pages|