Fixed merge conflicts in search services code

app/services/search/global_service.rb

@@ -11,15 +11,11 @@ module Search
       projects = ProjectsFinder.new.execute(current_user)
       projects = projects.in_namespace(group.id) if group
 
-<<<<<<< HEAD
       if Gitlab.config.elasticsearch.enabled
-        Gitlab::Elastic::SearchResults.new(project_ids, params[:search])
+        Gitlab::Elastic::SearchResults.new(projects.pluck(:id), params[:search])
       else
-        Gitlab::SearchResults.new(project_ids, params[:search])
-      end
-=======
         Gitlab::SearchResults.new(projects, params[:search])
->>>>>>> ce/master
+      end
     end
   end
 end

app/services/search/project_service.rb

@@ -7,21 +7,15 @@ module Search
     end
 
     def execute
-<<<<<<< HEAD
       if Gitlab.config.elasticsearch.enabled
         Gitlab::Elastic::ProjectSearchResults.new(project.id,
                                          params[:search],
                                          params[:repository_ref])
       else
-        Gitlab::ProjectSearchResults.new(project.id,
-                                         params[:search],
-                                         params[:repository_ref])
-      end
-=======
         Gitlab::ProjectSearchResults.new(project,
                                          params[:search],
                                          params[:repository_ref])
->>>>>>> ce/master
+      end
     end
   end
 end

app/services/search/snippet_service.rb

@@ -7,19 +7,14 @@ module Search
     end
 
     def execute
-<<<<<<< HEAD
-      snippet_ids = Snippet.accessible_to(current_user).pluck(:id)
+      snippets = Snippet.accessible_to(current_user)
 
       if Gitlab.config.elasticsearch.enabled
-        Gitlab::Elastic::SnippetSearchResults.new(snippet_ids, params[:search])
+        Gitlab::Elastic::SnippetSearchResults.new(snippets.pluck(:id),
+                                                  params[:search])
       else
-        Gitlab::SnippetSearchResults.new(snippet_ids, params[:search])
-      end
-=======
-      snippets = Snippet.accessible_to(current_user)
-
         Gitlab::SnippetSearchResults.new(snippets, params[:search])
->>>>>>> ce/master
+      end
     end
   end
 end