Fix conflicts in spinach test suite

features/steps/shared/issuable.rb

@@ -58,10 +58,7 @@ module SharedIssuable
   step 'I visit merge request page "Enterprise fix"' do
     mr = MergeRequest.find_by(title: 'Enterprise fix')
     visit project_merge_request_path(mr.target_project, mr)
-<<<<<<< HEAD
     wait_for_requests
-=======
->>>>>>> ce/master
   end
 
   step 'I visit issue page "Community issue"' do

features/steps/shared/paths.rb

@@ -274,13 +274,10 @@ module SharedPaths
 
   step 'I visit project hooks page' do
     visit project_settings_integrations_path(@project)
-<<<<<<< HEAD
   end
 
   step 'I visit group hooks page' do
     visit group_hooks_path(@group)
-=======
->>>>>>> ce/master
   end
 
   step 'I visit project deploy keys page' do