From da387fd310d0d02557b2c1d4358f83548f07a8ed Mon Sep 17 00:00:00 2001
From: marshal <marshyordanos@gmail.com>
Date: Fri, 12 Jun 2026 14:58:39 +0300
Subject: [PATCH] fix merge conflict

---
 apps/edr-freight-web/portal/src/pages/SettingsPage.tsx          | 1 +
 .../src/pages/bookings/new-booking-form/step5-cargo-details.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
index 2083fcd37..755f85b45 100644
--- a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
@@ -108,3 +108,4 @@ export default function SettingsPage() {
     </div>
   );
 }
+//
\ No newline at end of file
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step5-cargo-details.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step5-cargo-details.tsx
index cbd70f5ac..9c877c7b2 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step5-cargo-details.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step5-cargo-details.tsx
@@ -12,7 +12,7 @@ import {
 import type { Freight } from "@edr/types";
 import {
   BookingFormInputValues,
-  calcWagons,
+  calcWagons, 
   type BookingFormValues,
   type RouteDirection,
 } from "./schema";