Fix conflict in app/views/layouts/header/_default.html.haml

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

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