Resolve dependencies.js conflicts

app/assets/javascripts/vue_merge_request_widget/dependencies.js

@@ -37,15 +37,8 @@ export { default as CheckingState } from './components/states/mr_widget_checking
 export { default as MRWidgetStore } from './ee/stores/mr_widget_store';
 export { default as MRWidgetService } from './ee/services/mr_widget_service';
 export { default as eventHub } from './event_hub';
-<<<<<<< HEAD
 export { default as getStateKey } from './ee/stores/get_state_key';
 export { default as mrWidgetOptions } from './ee/mr_widget_options';
 export { default as stateMaps } from './ee/stores/state_maps';
 export { default as SquashBeforeMerge } from './ee/components/states/mr_widget_squash_before_merge';
-=======
-export { default as getStateKey } from './stores/get_state_key';
-export { default as mrWidgetOptions } from './mr_widget_options';
-export { default as stateMaps } from './stores/state_maps';
-export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
 export { default as notify } from '../lib/utils/notify';
->>>>>>> upstream/master