Fix Spinach conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

features/steps/project/forked_merge_requests.rb

@@ -32,10 +32,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     expect(page).to have_content @project.path_with_namespace
     expect(page).to have_content @merge_request.source_branch
     expect(page).to have_content @merge_request.target_branch
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/master
     wait_for_vue_resource
   end
 

features/steps/project/merge_requests.rb

@@ -422,10 +422,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     page.within '.status-box' do
       expect(page).to have_content "Open"
     end
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
     wait_for_vue_resource
   end
 

features/support/env.rb

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