resolve js conflicts on ee-only features

app/assets/javascripts/build.js

@@ -82,15 +82,6 @@ window.Build = (function () {
 
   Build.prototype.getBuildTrace = function () {
     return $.ajax({
-<<<<<<< HEAD
-      url: this.pageUrl + "/trace.json",
-      dataType: 'json',
-      success: function(buildData) {
-        $('.js-build-output').html(buildData.html);
-        gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`);
-        if (window.location.hash === DOWN_BUILD_TRACE) {
-          $("html,body").scrollTop(this.$buildTrace.height());
-=======
       url: `${this.pageUrl}/trace.json`,
       dataType: 'json',
       data: {
@@ -101,7 +92,6 @@ window.Build = (function () {
 
         if (log.state) {
           this.state = log.state;
->>>>>>> 9-1-stable
         }
 
         if (log.append) {

app/assets/javascripts/dispatcher.js

@@ -48,12 +48,9 @@ import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
 import BlobForkSuggestion from './blob/blob_fork_suggestion';
 import UserCallout from './user_callout';
 import { ProtectedTagCreate, ProtectedTagEditList } from './protected_tags';
-<<<<<<< HEAD
 
 import GeoNodes from './geo_nodes';
 import ServiceDeskRoot from './projects/settings_service_desk/service_desk_root';
-=======
->>>>>>> 9-1-stable
 
 const ShortcutsBlob = require('./shortcuts_blob');
 
@@ -358,10 +355,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
           // Initialize Protected Branch Settings
           new gl.ProtectedBranchCreate();
           new gl.ProtectedBranchEditList();
-<<<<<<< HEAD
           new UsersSelect();
-=======
->>>>>>> 9-1-stable
           // Initialize Protected Tag Settings
           new ProtectedTagCreate();
           new ProtectedTagEditList();

app/assets/javascripts/filtered_search/filtered_search_manager.js

@@ -16,13 +16,10 @@ import eventHub from './event_hub';
       this.tokensContainer = this.container.querySelector('.tokens-container');
       this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
 
-<<<<<<< HEAD
       if (page === 'issues' || page === 'boards') {
         this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
       }
 
-=======
->>>>>>> 9-1-stable
       this.recentSearchesStore = new RecentSearchesStore();
       let recentSearchesKey = 'issue-recent-searches';
       if (page === 'merge_requests') {