fix merge conflict

apps/edr-freight-web/portal/src/pages/SettingsPage.tsx

@@ -108,3 +108,4 @@ export default function SettingsPage() {
     </div>
   );
 }
+//

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";