diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
index 98bc2332e..7cc3d60d8 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
@@ -42,16 +42,13 @@ import type { Response } from "express";
 import { BookingClearanceChargeService } from './booking-clearance-charge.service';
 import { BookingPayablesService } from './booking-payables.service';
 import { ClearanceEventService } from './clearance-event.service';
-<<<<<<< HEAD
 import {
-  BillClearanceChargeDto,
+  
   RejectClearanceChargeDto,
 } from './dto/clearance-charge.dto';
-=======
 import { BillClearanceChargeDto } from './dto/clearance-charge.dto';
 import { AdditionalChargeService } from './additional-charge.service';
 import { CancelAdditionalChargeDto, CreateAdditionalChargeDto } from './dto/additional-charge.dto';
->>>>>>> 82c795999efce5e4422dd332551cecab2592764d
 import { BookingContractService } from './booking-contract.service';
 import { BookingPricingService } from './booking-pricing.service';
 import { BookingTransitionService } from './booking-transition.service';