Fix view conflicts

app/views/projects/edit.html.haml

-<<<<<<< HEAD
+- @content_class = "limit-container-width" unless fluid_layout
+
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
   = webpack_bundle_tag('service_desk')
-=======
-- @content_class = "limit-container-width" unless fluid_layout
->>>>>>> ce/master
 
 = render "projects/settings/head"
 
@@ -57,13 +55,8 @@
             Sharing &amp; Permissions
           .form_group.prepend-top-20.sharing-and-permissions
             .row.js-visibility-select
-<<<<<<< HEAD
-              .col-md-9
-                %label.label-light
-=======
               .col-md-8
                 .label-light
->>>>>>> ce/master
                   = label_tag :project_visibility, 'Project Visibility', class: 'label-light', for: :project_visibility_level
                   = link_to icon('question-circle'), help_page_path("public_access/public_access")
                 %span.help-block

app/views/projects/tree/_tree_header.html.haml

-<<<<<<< HEAD
-.tree-controls
-  = lock_file_link(html_options: { class: 'btn btn-grouped path-lock' })
-
-  = render 'projects/find_file_link'
-
-  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn btn-grouped'
-
-  = render 'projects/buttons/download', project: @project, ref: @ref
-=======
 .tree-ref-container
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'tree', path: @path
->>>>>>> ce/master
 
   %ul.breadcrumb.repo-breadcrumb
     %li
@@ -21,23 +10,11 @@
       %li
         = link_to truncate(title, length: 40), namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
 
-<<<<<<< HEAD
-
     - if current_user
       %li
         - if !on_top_of_branch?
           %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
             = icon('plus')
-      - else
-        %span.dropdown
-          %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown" }
-=======
-    - if current_user
-      %li
-        - if !on_top_of_branch?
-          %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
->>>>>>> ce/master
-            = icon('plus')
         - else
           %span.dropdown
             %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown", "data-target" => ".add-to-tree-dropdown" }
@@ -98,7 +75,7 @@
 
 .tree-controls
   = render 'projects/find_file_link'
-
-  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn'
+  = lock_file_link(html_options: { class: 'btn btn-grouped path-lock' })
+  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn btn-grouped'
 
   = render 'projects/buttons/download', project: @project, ref: @ref