Resolve merge conflicts in spinach suite

features/steps/project/merge_requests.rb

@@ -558,7 +558,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     expect(page).to have_content 'Request to merge fix into feature'
     expect(page).to have_content 'changed target branch from merge-test to feature'
     wait_for_requests
-<<<<<<< HEAD
   end
 
   step 'project settings contain list of approvers' do
@@ -676,8 +675,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).to have_content("Requires 1 more approval")
       wait_for_requests
     end
-=======
->>>>>>> ce/master
   end
 
   step 'I click on "Email Patches"' do

features/steps/project/project.rb

@@ -2,10 +2,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
-<<<<<<< HEAD
   include Select2Helper
-=======
->>>>>>> ce/master
   include WaitForRequests
 
   step 'change project settings' do

features/support/env.rb

@@ -11,14 +11,11 @@ if ENV['CI']
 end
 
 %w(select2_helper test_env repo_helpers wait_for_requests sidekiq).each do |f|
-<<<<<<< HEAD
   require Rails.root.join('spec', 'support', f)
 end
 
 # EE-only
 %w(license).each do |f|
-=======
->>>>>>> ce/master
   require Rails.root.join('spec', 'support', f)
 end