diff --git a/lib/handlers/quote/injector.ts b/lib/handlers/quote/injector.ts
index a67cfb35..6a646784 100644
--- a/lib/handlers/quote/injector.ts
+++ b/lib/handlers/quote/injector.ts
@@ -7,8 +7,8 @@ import {
   BETA_COMPLIANCE_S3_KEY,
   BETA_S3_KEY,
   COMPLIANCE_CONFIG_BUCKET,
-  PROD_COMPLIANCE_S3_KEY,
   PRODUCTION_S3_KEY,
+  PROD_COMPLIANCE_S3_KEY,
   WEBHOOK_CONFIG_BUCKET,
 } from '../../constants';
 import { AWSMetricsLogger, UniswapXParamServiceMetricDimension } from '../../entities/aws-metrics-logger';
diff --git a/lib/providers/analytics/firehose.ts b/lib/providers/analytics/firehose.ts
index 96ec3ddf..5b84ab46 100644
--- a/lib/providers/analytics/firehose.ts
+++ b/lib/providers/analytics/firehose.ts
@@ -1,8 +1,8 @@
 import { FirehoseClient, PutRecordCommand } from '@aws-sdk/client-firehose';
 import { default as Logger } from 'bunyan';
 
-import { AnalyticsEvent } from '../../entities/analytics-events';
 import { IAnalyticsLogger } from '.';
+import { AnalyticsEvent } from '../../entities/analytics-events';
 
 export class FirehoseLogger implements IAnalyticsLogger {
   private log: Logger;
diff --git a/test/handlers/quote/handler.test.ts b/test/handlers/quote/handler.test.ts
index f7a46adc..88860836 100644
--- a/test/handlers/quote/handler.test.ts
+++ b/test/handlers/quote/handler.test.ts
@@ -302,16 +302,10 @@ describe('Quote handler', () => {
           hash: '0xuni',
         },
       ]);
-<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
-=======
-      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
-        { hash: '0xuni', fadeRate: 0.02, enabled: true },
-      ]);
->>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -365,16 +359,10 @@ describe('Quote handler', () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
         { name: 'uniswap', endpoint: 'https://uniswap.org', headers: {}, hash: '0xuni' },
       ]);
-<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
-=======
-      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
-        { hash: '0xuni', fadeRate: 0.02, enabled: true },
-      ]);
->>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -406,16 +394,10 @@ describe('Quote handler', () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
         { name: 'uniswap', endpoint: 'https://uniswap.org', headers: {}, hash: '0xuni' },
       ]);
-<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
-=======
-      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
-        { hash: '0xuni', fadeRate: 0.02, enabled: true },
-      ]);
->>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -621,7 +603,6 @@ describe('Quote handler', () => {
         })
       );
     });
-<<<<<<< HEAD
 
     it('only calls eligible fillers', async () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
@@ -659,7 +640,5 @@ describe('Quote handler', () => {
         expect.anything()
       );
     });
-=======
->>>>>>> main
   });
 });