Resolve conflicts

app/assets/stylesheets/framework.scss

@@ -59,9 +59,6 @@
 @import "framework/memory_graph";
 @import "framework/responsive_tables";
 @import "framework/stacked_progress_bar";
-<<<<<<< HEAD
 @import "framework/sortable";
-=======
->>>>>>> upstream/master
 @import "framework/ci_variable_list";
 @import "framework/feature_highlight";

lib/api/search.rb

@@ -108,10 +108,8 @@ module API
         use :pagination
       end
       get ':id/-/search' do
-<<<<<<< HEAD
         check_elasticsearch_scope!
-=======
->>>>>>> upstream/master
+
         group = find_group!(params[:id])
 
         present search(group_id: group.id), with: entity

spec/requests/api/search_spec.rb

@@ -276,7 +276,6 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
       end
-<<<<<<< HEAD
 
       context 'when elasticsearch is disabled' do
         it_behaves_like 'elasticsearch disabled' do
@@ -289,8 +288,6 @@ describe API::Search do
           let(:endpoint) { "/groups/#{group.id}/-/search" }
         end
       end
-=======
->>>>>>> upstream/master
     end
   end