Resolve conflict in authentication.rb

features/steps/shared/authentication.rb

@@ -22,13 +22,10 @@ module SharedAuthentication
     sign_in(@user)
   end
 
-<<<<<<< HEAD
   step 'I sign in as "Pete Peters"' do
     gitlab_sign_in(user_exists("Pete Peters"))
   end
 
-=======
->>>>>>> upstream/master
   step 'I should be redirected to sign in page' do
     expect(current_path).to eq new_user_session_path
   end