[ci skip] Fixes conflicts for `app/assets/javascripts/main.js`

app/assets/javascripts/main.js

@@ -145,7 +145,6 @@ import './star';
 import './subscription';
 import './subscription_select';
 import initBreadcrumbs from './breadcrumb';
-<<<<<<< HEAD
 
 // EE-only scripts
 import './admin_email_select';
@@ -155,8 +154,6 @@ import './ee_trial_banner';
 import './ldap_groups_select';
 import './path_locks';
 import './weight_select';
-=======
->>>>>>> upstream/master
 
 import './dispatcher';