Fix Pipeline Processing related failures

app/services/ci/create_pipeline_service.rb

@@ -26,15 +26,11 @@ module Ci
         save_incompleted: save_on_errors,
         seeds_block: block,
         project: project,
-<<<<<<< HEAD
         current_user: current_user,
 
         # EE specific
         allow_mirror_update: mirror_update
       )
-=======
-        current_user: current_user)
->>>>>>> upstream/master
 
       sequence = Gitlab::Ci::Pipeline::Chain::Sequence
         .new(pipeline, command, SEQUENCE)

lib/gitlab/ci/pipeline/chain/command.rb

@@ -7,14 +7,10 @@ module Gitlab
           :origin_ref, :checkout_sha, :after_sha, :before_sha,
           :trigger_request, :schedule,
           :ignore_skip_ci, :save_incompleted,
-<<<<<<< HEAD
           :seeds_block,
 
           # EE specific
           :allow_mirror_update
-=======
-          :seeds_block
->>>>>>> upstream/master
         ) do
           include Gitlab::Utils::StrongMemoize
 

spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb

@@ -10,12 +10,8 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
 
   let(:command) do
     Gitlab::Ci::Pipeline::Chain::Command.new(
-<<<<<<< HEAD
       project: project, current_user: user, origin_ref: ref,
       allow_mirror_update: false)
-=======
-      project: project, current_user: user, origin_ref: ref)
->>>>>>> upstream/master
   end
 
   let(:step) { described_class.new(pipeline, command) }