Resolve conflicts in lib/gitlab/ci/pipeline/chain/command.rb

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

@@ -7,15 +7,11 @@ module Gitlab # rubocop:disable Naming/FileName
           :origin_ref, :checkout_sha, :after_sha, :before_sha,
           :trigger_request, :schedule,
           :ignore_skip_ci, :save_incompleted,
-<<<<<<< HEAD
           :seeds_block, :variables_attributes,
 
           # EE specific
           :allow_mirror_update,
           :chat_data
-=======
-          :seeds_block, :variables_attributes
->>>>>>> upstream/master
         ) do
           include Gitlab::Utils::StrongMemoize