fix merge conflicts

app/views/projects/edit.html.haml

@@ -4,7 +4,8 @@
 
 = render "projects/settings/head"
 
-%section.settings.general-settings
+.project-edit-container
+  %section.settings.general-settings
     .settings-header
       %h4
         General project settings
@@ -71,7 +72,7 @@
         Enable or disable certain project features and choose access levels.
     .settings-content.no-animate{ class: ('expaneded' if expanded) }
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f|
-        .form-group.sharing-and-permissions
+        .form_group.sharing-and-permissions
           .row.js-visibility-select
             .col-md-8
               .label-light
@@ -95,6 +96,7 @@
                   %span.help-block Submit changes to be merged upstream
                 .col-md-4
                   = project_feature_access_select(:merge_requests_access_level)
+
               .row
                 .col-md-8.project-feature.nested
                   = feature_fields.label :builds_access_level, "Pipelines", class: 'label-light'
@@ -122,7 +124,6 @@
                   %span.help-block Pages for project documentation
                 .col-md-4
                   = project_feature_access_select(:wiki_access_level)
-
         .form-group
           = render 'shared/allow_request_access', form: f
         - if Gitlab.config.lfs.enabled && current_user.admin?
@@ -147,7 +148,7 @@
         = f.submit 'Save changes', class: "btn btn-save"
 
 
-%section.settings.merge-request-settings{ style: ("display: none;" if @project.project_feature.send(:merge_requests_access_level) == 0) }
+  %section.settings.merge-request-settings{ style: ("display: none;" if @project.project_feature.send(:merge_requests_access_level) == 0) }
     .settings-header
       %h4
         Merge request settings
@@ -160,7 +161,7 @@
         = render 'merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save"
 
-%section.settings
+  %section.settings
     .settings-header
       %h4
         Export project
@@ -197,7 +198,7 @@
         = link_to 'Export project', export_project_path(@project),
                 method: :post, class: "btn btn-default"
 
-%section.settings.advanced-settings
+  %section.settings.advanced-settings
     .settings-header
       %h4
         Advanced settings
@@ -210,7 +211,7 @@
         %h4 Housekeeping
         %p
           Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects.
-      = link_to 'Housekeeping', housekeeping_project_path(@project),
+        = link_to 'Run housekeeping', housekeeping_project_path(@project),
             method: :post, class: "btn btn-default"
       - if can? current_user, :archive_project, @project
         .sub-section
@@ -259,7 +260,6 @@
               - if @project.deployment_services.any?
                 %li Your deployment services will be broken, you will need to manually fix the services after renaming.
           = f.submit 'Rename project', class: "btn btn-warning"
-
       - if can?(current_user, :change_namespace, @project)
         .sub-section
           %h4.danger-title