Resolve check_gcp_project_billing_worker.rb

app/workers/check_gcp_project_billing_worker.rb

@@ -6,10 +6,7 @@ class CheckGcpProjectBillingWorker
 
   LEASE_TIMEOUT = 15.seconds.to_i
   SESSION_KEY_TIMEOUT = 5.minutes
-<<<<<<< HEAD
-=======
   BILLING_TIMEOUT = 1.hour
->>>>>>> upstream/master
 
   def self.get_session_token(token_key)
     Gitlab::Redis::SharedState.with do |redis|
@@ -38,13 +35,9 @@ class CheckGcpProjectBillingWorker
 
     billing_enabled_projects = CheckGcpProjectBillingService.new.execute(token)
     Gitlab::Redis::SharedState.with do |redis|
-<<<<<<< HEAD
-      redis.set(self.class.redis_shared_state_key_for(token), !billing_enabled_projects.empty?)
-=======
       redis.set(self.class.redis_shared_state_key_for(token),
         !billing_enabled_projects.empty?,
         ex: BILLING_TIMEOUT)
->>>>>>> upstream/master
     end
   end