Resolving conflict with app/assets/javascripts/pages/search/init_filtered_search.js

app/assets/javascripts/pages/search/init_filtered_search.js

-<<<<<<< HEAD
 export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => {
   const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search');
   if (filteredSearchEnabled) {
@@ -7,12 +6,6 @@ export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => {
       filteredSearchTokenKeys,
       stateFiltersSelector,
     });
-=======
-export default ({ page }) => {
-  const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search');
-  if (filteredSearchEnabled) {
-    const filteredSearchManager = new gl.FilteredSearchManager({ page });
->>>>>>> upstream/master
     filteredSearchManager.setup();
   }
 };