merge conflict fix

apps/edr-freight-api/src/app.module.ts

@@ -13,6 +13,7 @@ import telebirrConfig from "./config/telebirr.config";
 import rabbitmqConfig from "./config/rabbitmq.config";
 
 import { BookingsModule } from "./modules/bookings/bookings.module";
+import { BookingOrdersModule } from "./modules/booking-orders/booking-orders.module";
 import { SignaturesModule } from "./modules/signatures/signatures.module";
 import { FilesModule } from "./modules/files/files.module";
 import { ConsignmentsModule } from "./modules/consignments/consignments.module";
@@ -62,6 +63,9 @@ import { RoutesModule } from './modules/routes/routes.module';
 import { WarehousesModule } from './modules/warehouses/warehouses.module';
 import { OverviewModule } from './modules/overview/overview.module';
 import { VehiclesModule } from './modules/vehicles/vehicles.module';
+import { DriversModule } from './modules/drivers/drivers.module';
+import { FirstMileModule } from './modules/first-mile/first-mile.module';
+import { LastMileModule } from './modules/last-mile/last-mile.module';
 
 @Module({
   imports: [
@@ -90,6 +94,7 @@ import { VehiclesModule } from './modules/vehicles/vehicles.module';
       permissions: EDR_FREIGHT_PERMISSIONS,
     }),
     BookingsModule,
+    BookingOrdersModule,
     SignaturesModule,
     FilesModule,
     ConsignmentsModule,
@@ -120,6 +125,9 @@ import { VehiclesModule } from './modules/vehicles/vehicles.module';
     WarehousesModule,
     OverviewModule,
     VehiclesModule,
+    DriversModule,
+    FirstMileModule,
+    LastMileModule,
   ],
   providers: [
     EdrOrgSeeder,