resolve conflicts

app/assets/javascripts/dispatcher.js

@@ -11,10 +11,7 @@ import GroupLabelSubscription from './group_label_subscription';
 import LineHighlighter from './line_highlighter';
 import MergeRequest from './merge_request';
 import Compare from './compare';
-<<<<<<< HEAD
 import initCompareAutocomplete from './compare_autocomplete';
-=======
->>>>>>> upstream/master
 import Labels from './labels';
 import LabelManager from './label_manager';
 import Sidebar from './right_sidebar';

app/assets/javascripts/pages/projects/edit/index.js

@@ -7,7 +7,6 @@ import setupProjectEdit from '~/project_edit';
 import ProjectNew from '../shared/project_new';
 import projectAvatar from '../shared/project_avatar';
 import initProjectPermissionsSettings from '../shared/permissions';
-<<<<<<< HEAD
 
 // EE imports
 import ApproversSelect from 'ee/approvers_select'; // eslint-disable-line import/first
@@ -16,23 +15,15 @@ export default () => {
   new ProjectNew(); // eslint-disable-line no-new
   new UsersSelect();
   groupsSelect();
-=======
-
-export default () => {
-  new ProjectNew(); // eslint-disable-line no-new
->>>>>>> upstream/master
   setupProjectEdit();
   // Initialize expandable settings panels
   initSettingsPanels();
   projectAvatar();
   initProjectPermissionsSettings();
-<<<<<<< HEAD
 
   new UserCallout({ className: 'js-service-desk-callout' });
   new UserCallout({ className: 'js-mr-approval-callout' });
 
   // EE imports
   new ApproversSelect(); // eslint-disable-line no-new
-=======
->>>>>>> upstream/master
 };

app/assets/javascripts/projects/project_new.js

@@ -99,7 +99,6 @@ const bindEvents = () => {
 
   $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl));
 
-<<<<<<< HEAD
   $('.import_git').on('click', () => {
     const $projectMirror = $('#project_mirror');
 
@@ -107,8 +106,6 @@ const bindEvents = () => {
   });
 };
 
-=======
->>>>>>> upstream/master
 export default {
   bindEvents,
   deriveProjectPathFromUrl,