Fix conflicts in spec/services/merge_requests

spec/services/merge_requests/conflicts/resolve_service_spec.rb

@@ -6,15 +6,7 @@ describe MergeRequests::Conflicts::ResolveService do
   let(:project) { create(:project, :public, :repository) }
 
   let(:forked_project) do
-<<<<<<< HEAD
     fork_project_with_submodules(project, user)
-=======
-    forked_project = fork_project(project, user)
-    TestEnv.copy_repo(forked_project,
-                      bare_repo: TestEnv.forked_repo_path_bare,
-                      refs: TestEnv::FORKED_BRANCH_SHA)
-    forked_project
->>>>>>> ce-com/master
   end
 
   let(:merge_request) do

spec/services/merge_requests/refresh_service_spec.rb

@@ -13,11 +13,7 @@ describe MergeRequests::RefreshService do
       group = create(:group)
       group.add_owner(@user)
 
-<<<<<<< HEAD
       @project = create(:project, :repository, namespace: group, approvals_before_merge: 1, reset_approvals_on_push: true)
-=======
-      @project = create(:project, :repository, namespace: group)
->>>>>>> ce-com/master
       @fork_project = fork_project(@project, @user, repository: true)
 
       @merge_request = create(:merge_request,