Resolve app/services/search/global_service.rb

According to:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3842

app/services/search/global_service.rb

@@ -11,16 +11,12 @@ module Search
     end
 
     def execute
-<<<<<<< HEAD
       if current_application_settings.elasticsearch_search?
         Gitlab::Elastic::SearchResults.new(current_user, params[:search], elastic_projects, elastic_global)
       else
-        Gitlab::SearchResults.new(current_user, projects, params[:search])
-      end
-=======
         Gitlab::SearchResults.new(current_user, projects, params[:search],
                                   default_project_filter: default_project_filter)
->>>>>>> upstream/master
+      end
     end
 
     def projects