resolve conflicts on app/assets/javascripts/dispatcher.js

app/assets/javascripts/dispatcher.js

@@ -12,7 +12,6 @@ import ShortcutsIssuable from './shortcuts_issuable';
 import Diff from './diff';
 import SearchAutocomplete from './search_autocomplete';
 
-<<<<<<< HEAD
 // EE-only
 import UsersSelect from './users_select';
 import UserCallout from './user_callout';
@@ -23,8 +22,6 @@ import initPathLocks from 'ee/path_locks'; // eslint-disable-line import/first
 import initApprovals from 'ee/approvals'; // eslint-disable-line import/first
 import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line import/first
 
-=======
->>>>>>> upstream/master
 var Dispatcher;
 
 (function() {