Fix conflicts for:

  -  app/assets/javascripts/label_manager.js
  - app/assets/javascripts/main.js
  - app/assets/javascripts/star.js

app/assets/javascripts/label_manager.js

@@ -2,27 +2,6 @@
 /* global Sortable */
 
 import Flash from './flash';
-<<<<<<< HEAD
-
-((global) => {
-  class LabelManager {
-    constructor({ togglePriorityButton, prioritizedLabels, otherLabels } = {}) {
-      this.togglePriorityButton = togglePriorityButton || $('.js-toggle-priority');
-      this.prioritizedLabels = prioritizedLabels || $('.js-prioritized-labels');
-      this.otherLabels = otherLabels || $('.js-other-labels');
-      this.errorMessage = 'Unable to update label prioritization at this time';
-      this.emptyState = document.querySelector('#js-priority-labels-empty-state');
-      this.sortable = Sortable.create(this.prioritizedLabels.get(0), {
-        filter: '.empty-message',
-        forceFallback: true,
-        fallbackClass: 'is-dragging',
-        dataIdAttr: 'data-id',
-        onUpdate: this.onPrioritySortUpdate.bind(this),
-      });
-      this.bindEvents();
-    }
-=======
->>>>>>> upstream/master
 
 export default class LabelManager {
   constructor({ togglePriorityButton, prioritizedLabels, otherLabels } = {}) {

app/assets/javascripts/main.js

@@ -49,11 +49,6 @@ import './behaviors/';
 // everything else
 import './activities';
 import './admin';
-<<<<<<< HEAD
-import './api';
-import './ajax_loading_spinner';
-=======
->>>>>>> upstream/master
 import './aside';
 import './autosave';
 import loadAwardsHandler from './awards_handler';

app/assets/javascripts/star.js

-<<<<<<< HEAD
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-unused-vars, one-var, no-var, one-var-declaration-per-line, prefer-arrow-callback, no-new, max-len */
-=======
->>>>>>> upstream/master
 import Flash from './flash';
 import { __, s__ } from './locale';