Fix conflicts for:

 - app/assets/javascripts/dispatcher.js
 - app/assets/javascripts/project_find_file.js
 - app/assets/javascripts/render_gfm.js
 - app/assets/javascripts/search.js
 - app/assets/javascripts/search_autocomplete.js
 - app/assets/stylesheets/pages/merge_requests.scss
 - spec/javascripts/search_autocomplete_spec.js

app/assets/javascripts/dispatcher.js

@@ -24,10 +24,7 @@ import projectAvatar from './project_avatar';
 /* global MergeRequest */
 import Compare from './compare';
 import initCompareAutocomplete from './compare_autocomplete';
-<<<<<<< HEAD
 /* global PathLocks */
-=======
->>>>>>> upstream/master
 import ProjectFindFile from './project_find_file';
 import ProjectNew from './project_new';
 import projectImport from './project_import';

app/assets/javascripts/project_find_file.js

@@ -28,12 +28,7 @@ const highlighter = function(element, text, matches) {
 };
 
 export default class ProjectFindFile {
-<<<<<<< HEAD
-
-  constructor (element1, options) {
-=======
   constructor(element1, options) {
->>>>>>> upstream/master
     this.element = element1;
     this.options = options;
     this.goToBlob = this.goToBlob.bind(this);
@@ -75,11 +70,7 @@ export default class ProjectFindFile {
   // find file
   }
 
-<<<<<<< HEAD
-  // files pathes load
-=======
   // files pathes load
->>>>>>> upstream/master
   load(url) {
     return $.ajax({
       url: url,

app/assets/javascripts/render_gfm.js

 import renderMath from './render_math';
 import renderMermaid from './render_mermaid';
 import syntaxHighlight from './syntax_highlight';
-<<<<<<< HEAD
 
-=======
->>>>>>> upstream/master
 // Render Gitlab flavoured Markdown
 //
 // Delegates to syntax highlight and render math & mermaid diagrams.

app/assets/javascripts/search.js

@@ -79,11 +79,7 @@ export default class Search {
       .on('keyup', this.searchInput, this.searchKeyUp);
     $(document)
       .off('click', this.searchClear)
-<<<<<<< HEAD
-      .on('click', this.searchClear, this.clearSearchField);
-=======
       .on('click', this.searchClear, this.clearSearchField.bind(this));
->>>>>>> upstream/master
   }
 
   static submitSearch() {

app/assets/stylesheets/pages/merge_requests.scss

@@ -773,7 +773,6 @@
     font-size: 16px;
   }
 }
-<<<<<<< HEAD
 
 .mr-widget-icon {
   font-size: 22px;
@@ -825,5 +824,3 @@
     }
   }
 }
-=======
->>>>>>> upstream/master

spec/javascripts/search_autocomplete_spec.js

@@ -128,11 +128,7 @@ import * as urlUtils from '~/lib/utils/url_utility';
       window.gon.current_user_id = userId;
       window.gon.current_username = userName;
 
-<<<<<<< HEAD
-      return widget = new SearchAutocomplete;
-=======
       return widget = new SearchAutocomplete();
->>>>>>> upstream/master
     });
 
     afterEach(function() {