rebase & resolve conflicts

src/router.js

@@ -8,6 +8,7 @@ import VolunteersPage from "./pages/Volunteers/VolunteersPage";
 import ProfilePage from "./pages/Profile/ProfilePage";
 import EventsPage from "./pages/Events/EventsPage.jsx";
 
+
 const router = createBrowserRouter([
     {
       path: "/login",
@@ -40,7 +41,11 @@ const router = createBrowserRouter([
             {
                 path: "/volunteers",
                 Component: VolunteersPage,
-            }
+            },
+            {
+                path: "/stat",
+                Component:StatPage,
+            },
         ]
     }
 ])