Fix conflicts for

 - app/assets/javascripts/dispatcher.js
 - app/assets/javascripts/project.js
 - app/assets/javascripts/project_new.js

app/assets/javascripts/dispatcher.js

@@ -96,15 +96,12 @@ import DueDateSelectors from './due_date_select';
 import Diff from './diff';
 import ProjectLabelSubscription from './project_label_subscription';
 import ProjectVariables from './project_variables';
-<<<<<<< HEAD
 
 // EE-only
 import ApproversSelect from './approvers_select';
 import AuditLogs from './audit_logs';
 import initGeoInfoModal from './init_geo_info_modal';
 import initGroupAnalytics from './init_group_analytics';
-=======
->>>>>>> ce-com/master
 
 (function() {
   var Dispatcher;

app/assets/javascripts/project.js

@@ -57,11 +57,7 @@ export default class Project {
     Project.projectSelectDropdown();
   }
 
-<<<<<<< HEAD
   static projectSelectDropdown() {
-=======
-  static projectSelectDropdown () {
->>>>>>> ce-com/master
     projectSelect();
     $('.project-item-select').on('click', e => Project.changeProject($(e.currentTarget).val()));
   }

app/assets/javascripts/project_new.js

-/* eslint-disable func-names, no-var, no-underscore-dangle, prefer-template, prefer-arrow-callback*/
+/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-unused-vars, one-var, no-underscore-dangle, prefer-template, no-else-return, prefer-arrow-callback, max-len */
 
 import VisibilitySelect from './visibility_select';
 
@@ -12,7 +12,6 @@ export default class ProjectNew {
     this.toggleSettings = this.toggleSettings.bind(this);
     this.$selects = $('.features select');
     this.$repoSelects = this.$selects.filter('.js-repo-select');
-<<<<<<< HEAD
     this.$enableApprovers = $('.js-require-approvals-toggle');
     this.$projectSelects = this.$selects.not('.js-repo-select');
 
@@ -22,19 +21,10 @@ export default class ProjectNew {
         return $('.save-project-loader').show();
       };
     })(this));
-=======
-    this.$projectSelects = this.$selects.not('.js-repo-select');
-
-    $('.project-edit-container').on('ajax:before', () => {
-      $('.project-edit-container').hide();
-      return $('.save-project-loader').show();
-    });
->>>>>>> ce-com/master
 
     this.initVisibilitySelect();
 
     this.toggleSettings();
-<<<<<<< HEAD
     this.bindEvents();
     this.toggleRepoVisibility();
   }
@@ -44,12 +34,6 @@ export default class ProjectNew {
     $('#require_approvals').on('change', e => this.toggleApproverSettingsVisibility(e));
   }
 
-=======
-    this.toggleSettingsOnclick();
-    this.toggleRepoVisibility();
-  }
-
->>>>>>> ce-com/master
   initVisibilitySelect() {
     const visibilityContainer = document.querySelector('.js-visibility-select');
     if (!visibilityContainer) return;
@@ -93,7 +77,6 @@ export default class ProjectNew {
     });
   }
 
-<<<<<<< HEAD
   toggleApproverSettingsVisibility(e) {
     this.$requiredApprovals = $('#project_approvals_before_merge');
     const enabled = $(e.target).prop('checked');
@@ -103,8 +86,6 @@ export default class ProjectNew {
     $('.nested-settings').toggleClass('hidden', !enabled);
   }
 
-=======
->>>>>>> ce-com/master
   toggleSettings() {
     this.$selects.each(function () {
       var $select = $(this);
@@ -115,7 +96,6 @@ export default class ProjectNew {
     });
   }
 
-<<<<<<< HEAD
   static _showOrHide(checkElement, container) {
     var $container = $(container);
 
@@ -127,22 +107,6 @@ export default class ProjectNew {
   }
 
   toggleRepoVisibility () {
-=======
-  toggleSettingsOnclick() {
-    this.$selects.on('change', this.toggleSettings);
-  }
-
-  static _showOrHide(checkElement, container) {
-    const $container = $(container);
-
-    if ($(checkElement).val() !== '0') {
-      return $container.show();
-    }
-    return $container.hide();
-  }
-
-  toggleRepoVisibility() {
->>>>>>> ce-com/master
     var $repoAccessLevel = $('.js-repo-access-level select');
     var $lfsEnabledOption = $('.js-lfs-enabled select');
     var containerRegistry = document.querySelectorAll('.js-container-registry')[0];
@@ -153,12 +117,7 @@ export default class ProjectNew {
       .nextAll()
       .hide();
 
-<<<<<<< HEAD
     $repoAccessLevel.off('change')
-=======
-    $repoAccessLevel
-      .off('change')
->>>>>>> ce-com/master
       .on('change', function () {
         var selectedVal = parseInt($repoAccessLevel.val(), 10);