Resolve merge conflicts

app/views/layouts/application.html.haml

@@ -4,10 +4,7 @@
   %body{ class: "#{user_application_theme} #{@body_class}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
     = render "layouts/init_auto_complete" if @gfm_form
     = render 'peek/bar'
-<<<<<<< HEAD
     = header_message
-=======
->>>>>>> upstream/master
     = render  partial: "layouts/header/default", locals: { project: @project, group: @group }
     = render 'layouts/page', sidebar: sidebar, nav: nav
     = footer_message

app/views/layouts/fullscreen.html.haml

@@ -3,10 +3,7 @@
   = render "layouts/head"
   %body{ class: "#{user_application_theme} #{@body_class} fullscreen-layout", data: { page: body_data_page } }
     = render 'peek/bar'
-<<<<<<< HEAD
     = header_message
-=======
->>>>>>> upstream/master
     = render partial: "layouts/header/default", locals: { project: @project, group: @group }
     = render 'shared/outdated_browser'
     .mobile-overlay

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

@@ -5,11 +5,7 @@
 - else
   - search_path_url = search_path
 
-<<<<<<< HEAD
-%header.navbar.navbar-gitlab.navbar-gitlab-new.qa-navbar.navbar-expand-sm
-=======
-%header.navbar.navbar-gitlab.qa-navbar.navbar-expand-sm
->>>>>>> upstream/master
+%header.navbar.navbar-gitlab.qa-navbar.navbar-expand-sm.navbar-gitlab-new
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
     .header-content

locale/gitlab.pot

@@ -2451,12 +2451,9 @@ msgstr ""
 msgid "Default Branch"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Default classification label"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Default: Directly import the Google Code email address or username"
 msgstr ""
 
@@ -6454,12 +6451,9 @@ msgstr ""
 msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Select the custom project template source group."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By <a href=\"#\">@johnsmith</a>\"). It will also associate and/or assign these issues and comments with the selected user."
 msgstr ""