CE->EE: Resolve some more JS conflicts

app/assets/javascripts/main.js

@@ -151,7 +151,6 @@ import './syntax_highlight';
 
 import './dispatcher';
 
-<<<<<<< HEAD
 // EE-only scripts
 import './admin_email_select';
 import './application_settings';
@@ -160,8 +159,6 @@ import './ldap_groups_select';
 import './path_locks';
 import './weight_select';
 
-=======
->>>>>>> ce/master
 // eslint-disable-next-line global-require, import/no-commonjs
 if (process.env.NODE_ENV !== 'production') require('./test_utils/');
 

app/assets/javascripts/profile/gl_crop.js

 /* eslint-disable no-useless-escape, max-len, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens */
-<<<<<<< HEAD
-import _ from 'underscore';
-import 'vendor/cropper';
-=======
 
 import 'cropper';
 import _ from 'underscore';
->>>>>>> ce/master
 
 ((global) => {
   // Matches everything but the file name