diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-dashboard.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-dashboard.service.ts
index fcc09f668..0bbcdee48 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-dashboard.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-dashboard.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { DataSource, IsNull } from 'typeorm';
+import { DataSource, FindManyOptions, IsNull, ObjectLiteral, Repository } from 'typeorm';
 
 import { Warehouse } from './entities/warehouse.entity';
 import { WarehouseInventory } from './entities/warehouse-inventory.entity';
@@ -26,6 +26,29 @@ export interface WarehouseDashboard {
 export class WarehouseDashboardService {
   constructor(private readonly dataSource: DataSource) {}
 
+  private async safeCount<T extends ObjectLiteral>(
+    repo: Repository<T>,
+    options?: FindManyOptions<T>,
+  ): Promise<number> {
+    try {
+      return await repo.count(options);
+    } catch {
+      return 0;
+    }
+  }
+
+  private async safeReceivedToday(startOfToday: Date): Promise<number> {
+    try {
+      return await this.dataSource
+        .getRepository(WarehouseInventory)
+        .createQueryBuilder('inv')
+        .where('inv.arrived_at >= :start', { start: startOfToday })
+        .getCount();
+    } catch {
+      return 0;
+    }
+  }
+
   async getDashboard(): Promise<WarehouseDashboard> {
     const warehouseRepo = this.dataSource.getRepository(Warehouse);
     const inventoryRepo = this.dataSource.getRepository(WarehouseInventory);
@@ -47,21 +70,18 @@ export class WarehouseDashboardService {
       delivered,
       receivedToday,
     ] = await Promise.all([
-      warehouseRepo.count(),
-      inventoryRepo.count(),
-      inventoryRepo.count({ where: { status: 'RECEIVED', inspectionStatus: IsNull() } }),
-      inventoryRepo.count({ where: { inspectionStatus: 'PASSED' } }),
-      inventoryRepo.count({ where: { status: 'STORED' } }),
-      inventoryRepo.count({ where: { status: 'RESERVED' } }),
-      inventoryRepo.count({ where: { status: 'READY_FOR_LOADING' } }),
-      inventoryRepo.count({ where: { status: 'LOADED' } }),
-      inventoryRepo.count({ where: { status: 'DISPATCHED' } }),
-      inventoryRepo.count({ where: { status: 'READY_FOR_PICKUP' } }),
-      inventoryRepo.count({ where: { status: 'DELIVERED' } }),
-      inventoryRepo
-        .createQueryBuilder('inv')
-        .where('inv.arrived_at >= :start', { start: startOfToday })
-        .getCount(),
+      this.safeCount(warehouseRepo),
+      this.safeCount(inventoryRepo),
+      this.safeCount(inventoryRepo, { where: { status: 'RECEIVED', inspectionStatus: IsNull() } }),
+      this.safeCount(inventoryRepo, { where: { inspectionStatus: 'PASSED' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'STORED' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'RESERVED' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'READY_FOR_LOADING' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'LOADED' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'DISPATCHED' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'READY_FOR_PICKUP' } }),
+      this.safeCount(inventoryRepo, { where: { status: 'DELIVERED' } }),
+      this.safeReceivedToday(startOfToday),
     ]);
 
     return {
diff --git a/apps/edr-freight-web/backoffice/src/App.tsx b/apps/edr-freight-web/backoffice/src/App.tsx
index 680e86858..ba465b962 100644
--- a/apps/edr-freight-web/backoffice/src/App.tsx
+++ b/apps/edr-freight-web/backoffice/src/App.tsx
@@ -1,569 +1,3 @@
-<<<<<<< HEAD
-import { Navigate, Outlet, Route, Routes, useLocation, useNavigate } from "react-router-dom";
-import {
-  Boxes,
-  FileText,
-  LayoutDashboard,
-  LayoutGrid,
-  Network,
-  Paperclip,
-  PackageCheck,
-  Send,
-  Settings,
-  SlidersHorizontal,
-  Train,
-  Truck,
-  Container,
-  Package,
-  PackageOpen,
-  Users,
-  Wallet,
-} from "lucide-react";
-
-import { FreightDashboardLayout, type SidebarItem, type SidebarSection } from "@/components/layout";
-import LoadingScreen from "./components/LoadingScreen";
-import { useAuth } from "./auth/useAuth";
-import LoginPage from "./pages/auth/LoginPage";
-import BookingContractPage from "./pages/bookings/BookingContractPage";
-import BookingRequestDetailPage from "./pages/bookings/BookingRequestDetailPage";
-import BookingRequestsPage from "./pages/bookings/BookingRequestsPage";
-import PaymentsPage from "./pages/payments/PaymentsPage";
-import NewBookingPage from "./pages/bookings/NewBookingPage";
-import UserManagementHostPage from "./pages/dashboard/user-management/UserManagementHostPage";
-import DemoUser1Page from "./pages/dashboard/demo/DemoUser1Page";
-import DemoUser2Page from "./pages/dashboard/demo/DemoUser2Page";
-import OverviewPage from "./pages/dashboard/OverviewPage";
-import MyProfilePage from "./pages/dashboard/MyProfilePage";
-//import EmployeesPage from "./pages/dashboard/user-management/EmployeesPage";
-import PermissionsPage from "./pages/dashboard/user-management/PermissionsPage";
-import PositionTypesPage from "./pages/dashboard/user-management/PositionTypesPage";
-import RolesPage from "./pages/dashboard/user-management/RolesPage";
-import UserManagementPage from "./pages/dashboard/user-management/UserManagementPage";
-import UsersPage from "./pages/dashboard/user-management/UsersPage";
-import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage";
-import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
-import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
-import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
-import CargoTypesPage from "./pages/ruleEngine/CargoTypesPage";
-import TrainScheduleV2ListPage from "./pages/trainScheduling/TrainScheduleV2ListPage";
-import BatchBoardPage from "./pages/trainScheduling/BatchBoardPage";
-import BatchScheduleDetailPage from "./pages/trainScheduling/BatchScheduleDetailPage";
-import TrainScheduleV2DetailPage from "./pages/trainScheduling/TrainScheduleV2DetailPage";
-import TrainScheduleTrackPage from "./pages/trainScheduling/TrainScheduleTrackPage";
-import TrainSchedulingGlobalRulesPage from "./pages/trainScheduling/TrainSchedulingGlobalRulesPage";
-import FleetResourcePage from "./pages/fleet/FleetResourcePage";
-import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
-import { FREIGHT_PERMS, hasPermission as hasFreightPermission } from "./lib/permissions";
-import { RequirePermission } from "./components/auth/RequirePermission";
-import TrainDetailPage from "./pages/trains/TrainDetailPage";
-import RoutesPage from "./pages/fleet/RoutesPage";
-import WarehouseDashboardPage from "./pages/warehouses/WarehouseDashboardPage";
-import WarehouseListPage from "./pages/warehouses/WarehouseListPage";
-import WarehouseDetailPage from "./pages/warehouses/WarehouseDetailPage";
-import WarehouseInventoryPage from "./pages/warehouses/WarehouseInventoryPage";
-import InventoryInquiryPage from "./pages/warehouses/InventoryInquiryPage";
-import LoadingQueuePage from "./pages/warehouses/LoadingQueuePage";
-import LoadedInventoryPage from "./pages/warehouses/LoadedInventoryPage";
-import DispatchQueuePage from "./pages/warehouses/DispatchQueuePage";
-import ArrivalQueuePage from "./pages/warehouses/ArrivalQueuePage";
-import WarehouseRulesPage from "./pages/warehouses/WarehouseRulesPage";
-import WarehouseInvoicesPage from "./pages/warehouses/WarehouseInvoicesPage";
-
-const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
-  {
-    title: "Main menu",
-    mutedTitle: true,
-    items: [
-      {
-        label: "Overview",
-        href: "/dashboard/overview",
-        icon: <LayoutDashboard />,
-      },
-      {
-        label: "UM",
-        href: "/um",
-        icon: <Users />,
-      },
-      {
-        label: "Booking requests",
-        href: "/dashboard/booking-requests",
-        icon: <FileText />,
-      },
-      {
-        label: "Payments",
-        href: "/dashboard/payments",
-        icon: <Wallet />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      ...demoItems,
-    ],
-  },
-  {
-    title: "Operations",
-    items: [
-      {
-        label: "Train Schedules",
-        href: "/dashboard/operations/train-scheduling-v2",
-        icon: <Train />,
-        permission: FREIGHT_PERMS.trainScheduling.view,
-      },
-      {
-        label: "Batch Board",
-        href: "/dashboard/operations/batch-board",
-        icon: <LayoutGrid />,
-        permission: FREIGHT_PERMS.trainScheduling.view,
-      },
-    ],
-  },
-  {
-    title: "Fleet Management",
-    items: [
-      {
-        label: "Routes",
-        href: "/dashboard/routes",
-        icon: <Network />,
-        permission: FREIGHT_PERMS.fleet.view,
-      },
-      {
-        label: "Locomotives",
-        href: "/dashboard/locomotives",
-        icon: <Train />,
-        permission: FREIGHT_PERMS.fleet.view,
-      },
-      // {
-      //   label: "Trains",
-      //   href: "/dashboard/trains",
-      //   icon: <Train />,
-      // },
-      // {
-      //   label: "Wagon types",
-      //   href: "/dashboard/wagon-types",
-      //   icon: <Boxes />,
-      // },
-      {
-        label: "Wagons",
-        href: "/dashboard/wagons",
-        icon: <Truck />,
-        permission: FREIGHT_PERMS.fleet.view,
-      },
-      {
-        label: "Vehicles",
-        href: "/dashboard/vehicles",
-        icon: <Truck />,
-        permission: FREIGHT_PERMS.fleet.view,
-      },
-      {
-        label: "Drivers",
-        href: "/dashboard/drivers",
-        icon: <Users />,
-        permission: FREIGHT_PERMS.fleet.view,
-      },
-      // {
-      //   label: "Containers",
-      //   href: "/dashboard/containers",
-      //   icon: <Container />,
-      // },
-      // {
-      //   label: "Cargoes",
-      //   href: "/dashboard/cargoes",
-      //   icon: <Package />,
-      // },
-    ],
-  },
-  {
-    title: "Warehouse Management",
-    items: [
-      {
-        label: "Warehouse Dashboard",
-        href: "/dashboard/warehouse-dashboard",
-        icon: <LayoutDashboard />,
-      },
-      {
-        label: "Warehouses",
-        href: "/dashboard/warehouses",
-        icon: <Container />,
-      },
-      {
-        label: "Inventory",
-        href: "/dashboard/warehouse-inventory",
-        icon: <Package />,
-      },
-      {
-        label: "Arrival Queue",
-        href: "/dashboard/arrival-queue",
-        icon: <PackageOpen />,
-      },
-      {
-        label: "Loading Queue",
-        href: "/dashboard/loading-queue",
-        icon: <Truck />,
-      },
-      {
-        label: "Loaded Inventory",
-        href: "/dashboard/loaded-inventory",
-        icon: <PackageCheck />,
-      },
-      {
-        label: "Dispatch Queue",
-        href: "/dashboard/dispatch-queue",
-        icon: <Send />,
-      },
-      {
-        label: "Inventory Inquiry",
-        href: "/dashboard/inventory-inquiry",
-        icon: <Boxes />,
-      },
-      {
-        label: "Allocation & Fees",
-        href: "/dashboard/warehouse-rules",
-        icon: <SlidersHorizontal />,
-      },
-      {
-        label: "Fee Invoices",
-        href: "/dashboard/warehouse-fee-invoices",
-        icon: <Wallet />,
-      },
-    ],
-  },
-  {
-    title: "Administration",
-    items: [
-      {
-        label: "File settings",
-        href: "/dashboard/file-settings",
-        icon: <Paperclip />,
-        permission: FREIGHT_PERMS.admin,
-      },
-      {
-        label: "Dropdown settings",
-        href: "/dashboard/dropdown-settings",
-        icon: <Settings />,
-        permission: FREIGHT_PERMS.admin,
-      },
-    ],
-  },
-  {
-    title: "Freight configuration",
-    mutedTitle: true,
-    items: [
-      {
-        label: "Configuration",
-        href: "/dashboard/configuration",
-        icon: <Boxes />,
-        children: [
-          ...getCategorySidebarChildren("configuration"),
-          // {
-          //   label: "Train scheduling rules",
-          //   href: "/dashboard/configuration/train-scheduling-rules",
-          // },
-        ],
-      },
-      {
-        label: "Rules",
-        href: "/dashboard/rules",
-        icon: <SlidersHorizontal />,
-        children: getCategorySidebarChildren("rules"),
-      },
-    ],
-  },
-];
-
-/** Keep only items the user is permitted to see; drop now-empty sections. */
-const filterSidebarByPermission = (
-  sections: SidebarSection[],
-  user: ReturnType<typeof useAuth>["user"],
-): SidebarSection[] => {
-  const itemAllowed = (item: SidebarItem): boolean => {
-    if (!item.permission) return true;
-    const keys = Array.isArray(item.permission)
-      ? item.permission
-      : [item.permission];
-    return keys.some((key) => hasFreightPermission(user, key));
-  };
-
-  return sections
-    .map((section) => ({
-      ...section,
-      items: section.items.filter(itemAllowed),
-    }))
-    .filter((section) => section.items.length > 0);
-};
-
-const DashboardShell = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
-  const { user, logout } = useAuth();
-
-  const demoItems: SidebarItem[] = [];
-
-  const sidebarSections = filterSidebarByPermission(
-    buildSidebarSections(demoItems),
-    user,
-  );
-  const displayName = user?.name?.en || user?.username || user?.email || "User";
-
-  return (
-    <FreightDashboardLayout
-      sidebarSections={sidebarSections}
-      activeHref={location.pathname}
-      onNavigate={navigate}
-      enableThemeToggle
-      userName={displayName}
-      userEmail={user?.email}
-      onLogout={logout}
-    >
-      <Outlet />
-    </FreightDashboardLayout>
-  );
-};
-
-const App = () => {
-  const { user, loading } = useAuth();
-
-  if (loading) {
-    return <LoadingScreen />;
-  }
-
-  if (!user) {
-    return (
-      <Routes>
-        <Route path="/auth" element={<LoginPage />} />
-        <Route path="/um/*" element={<UserManagementHostPage />} />
-        <Route path="*" element={<Navigate to="/auth" replace />} />
-      </Routes>
-    );
-  }
-
-  return (
-    <Routes>
-        <Route path="/um/*" element={<UserManagementHostPage />} />
-        <Route path="/" element={<Navigate to="/dashboard/overview" replace />} />
-        <Route path="/dashboard" element={<DashboardShell />}>
-          <Route index element={<Navigate to="/dashboard/overview" replace />} />
-          <Route path="overview" element={<OverviewPage />} />
-          <Route path="profile" element={<MyProfilePage />} />
-
-          <Route path="booking-requests" element={<BookingRequestsPage />} />
-          <Route
-            path="payments"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
-                <PaymentsPage />
-              </RequirePermission>
-            }
-          />
-          <Route path="booking-requests/new" element={<NewBookingPage />} />
-          <Route path="booking-requests/:id" element={<BookingRequestDetailPage />} />
-          <Route
-            path="booking-requests/:id/contract"
-            element={<BookingContractPage />}
-          />
-
-          <Route path="warehouse-dashboard" element={<WarehouseDashboardPage />} />
-          <Route path="warehouses" element={<WarehouseListPage />} />
-          <Route path="warehouses/:id" element={<WarehouseDetailPage />} />
-          <Route path="warehouse-inventory" element={<WarehouseInventoryPage />} />
-          <Route path="arrival-queue" element={<ArrivalQueuePage />} />
-          <Route path="loading-queue" element={<LoadingQueuePage />} />
-          <Route path="loaded-inventory" element={<LoadedInventoryPage />} />
-          <Route path="dispatch-queue" element={<DispatchQueuePage />} />
-          <Route path="inventory-inquiry" element={<InventoryInquiryPage />} />
-          <Route path="warehouse-rules" element={<WarehouseRulesPage />} />
-          <Route path="warehouse-fee-invoices" element={<WarehouseInvoicesPage />} />
-
-          <Route
-            path="operations/train-scheduling"
-            element={<Navigate to="/dashboard/operations/train-scheduling-v2" replace />}
-          />
-          <Route
-            path="operations/batch-board"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <BatchBoardPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="operations/batch-board/:scheduleId"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <BatchScheduleDetailPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="operations/train-scheduling-v2"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <TrainScheduleV2ListPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="operations/train-scheduling-v2/:scheduleId"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <TrainScheduleV2DetailPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="operations/train-scheduling-v2/:scheduleId/track"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <TrainScheduleTrackPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="routes"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <RoutesPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="locomotives"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="trains"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="trains/:id"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <TrainDetailPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="wagons"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="containers"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="cargoes"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="vehicles"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="drivers"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
-                <FleetResourcePage />
-              </RequirePermission>
-            }
-          />
-
-          {/* iframe-based user management module */}
-          <Route path="um/*" element={<UserManagementHostPage />} />
-
-          {/* Legacy embedded user management routes */}
-          <Route path="user-management" element={<UserManagementPage />} />
-          <Route path="user-management/users" element={<UsersPage />} />
-          <Route path="user-management/position-types" element={<PositionTypesPage />} />
-          {/* <Route path="user-management/employees" element={<EmployeesPage />} /> */}
-          <Route path="user-management/permissions" element={<PermissionsPage />} />
-          <Route path="user-management/roles" element={<RolesPage />} />
-
-          <Route
-            path="file-settings"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.admin}>
-                <FileUploadSettingsPage />
-              </RequirePermission>
-            }
-          />
-          <Route
-            path="dropdown-settings"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.admin}>
-                <DropdownSettingsPage />
-              </RequirePermission>
-            }
-          />
-
-          <Route
-            path="configuration"
-            element={<Navigate to="/dashboard/configuration/cargo-types" replace />}
-          />
-          <Route
-            path="configuration/train-scheduling-rules"
-            element={
-              <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-                <TrainSchedulingGlobalRulesPage />
-              </RequirePermission>
-            }
-          />
-          <Route path="configuration/cargo-types" element={<CargoTypesPage />} />
-          <Route path="configuration/cargo-types/:id" element={<CargoTypesPage />} />
-          <Route path="configuration/:resource" element={<RuleEngineResourcePage />} />
-
-          <Route
-            path="rules"
-            element={<Navigate to="/dashboard/rules/priority-configs" replace />}
-          />
-          <Route path="rules/:resource" element={<RuleEngineResourcePage />} />
-
-          <Route
-            path="rule-engine"
-            element={<Navigate to="/dashboard/configuration/cargo-types" replace />}
-          />
-          <Route path="rule-engine/:resource" element={<RuleEngineLegacyRedirect />} />
-
-          <Route path="user1" element={<DemoUser1Page />} />
-          <Route path="user2" element={<DemoUser2Page />} />
-
-          <Route
-            path="org-structure"
-            element={<Navigate to="/dashboard/user-management" replace />}
-          />
-          <Route
-            path="org-structure/*"
-            element={<Navigate to="/dashboard/user-management" replace />}
-          />
-        </Route>
-
-        <Route path="*" element={<Navigate to="/dashboard/overview" replace />} />
-    </Routes>
-  );
-};
-
-export default App;
-=======
 import {
   Boxes,
   Building2,
@@ -578,7 +12,6 @@ import {
   Paperclip,
   Send,
   Settings,
-  ShieldCheck,
   SlidersHorizontal,
   Train,
   Truck,
@@ -594,7 +27,6 @@ import LoginPage from "./pages/auth/LoginPage";
 import BookingContractPage from "./pages/bookings/BookingContractPage";
 import BookingRequestDetailPage from "./pages/bookings/BookingRequestDetailPage";
 import BookingRequestsPage from "./pages/bookings/BookingRequestsPage";
-import GlClearancePage from "./pages/bookings/GlClearancePage";
 import NewBookingPage from "./pages/bookings/NewBookingPage";
 import CustomerDetailPage from "./pages/customers/CustomerDetailPage";
 import CustomersPage from "./pages/customers/CustomersPage";
@@ -677,12 +109,6 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
   {
     title: "Operations",
     items: [
-      {
-        label: "Document Clearance",
-        href: "/dashboard/clearance",
-        icon: <ShieldCheck />,
-        permission: FREIGHT_PERMS.bookings.reviewDocuments,
-      },
       {
         label: "Train Schedules",
         href: "/dashboard/operations/train-scheduling-v2",
@@ -950,14 +376,6 @@ const App = () => {
           path="booking-requests/:id/contract"
           element={<BookingContractPage />}
         />
-        <Route
-          path="clearance"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.bookings.reviewDocuments}>
-              <GlClearancePage />
-            </RequirePermission>
-          }
-        />
         <Route path="warehouses" element={<WarehouseListPage />} />
         <Route path="warehouses/:id" element={<WarehouseDetailPage />} />
         <Route path="warehouse-inventory" element={<WarehouseInventoryPage />} />
@@ -1269,4 +687,3 @@ const App = () => {
 };
 
 export default App;
->>>>>>> ee94833a9ead8a825391bb18604e405ac76c70ca