Resolve conflict in spec/spec_helper.rb

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

spec/spec_helper.rb

@@ -93,14 +93,11 @@ RSpec.configure do |config|
   config.include WaitForRequests, :js
   config.include LiveDebugger, :js
   config.include MigrationsHelpers, :migration
-<<<<<<< HEAD
 
   # EE only START
   config.include EE::LicenseHelpers
   config.include Rails.application.routes.url_helpers, type: :routing
   # EE only END
-=======
->>>>>>> upstream/master
 
   if ENV['CI']
     # This includes the first try, i.e. tests will be run 4 times before failing.