Resolve merge errors

dapp/src/DApp.tsx

@@ -9,9 +9,6 @@ import {
   SidebarContextProvider,
   WalletContextProvider,
 } from "./contexts"
-import { AcreSdkProvider } from "./acre-react/contexts"
-import GlobalStyles from "./components/GlobalStyles"
-import { router } from "./router"
 import { useInitApp } from "./hooks"
 import { Router } from "./router"
 import { store } from "./store"

dapp/src/components/Header/index.tsx

@@ -9,7 +9,7 @@ import { Navigation } from "./Navigation"
 // TODO: To be adjusted after project pivot/cleanup
 const NAVIGATION_ITEMS: NavigationItemType[] = [
   { label: "Season 1", href: routerPath.home },
-  { label: "Dashboard", href: routerPath.overview },
+  { label: "Dashboard", href: routerPath.dashboard },
 ]
 
 export default function Header() {

dapp/src/components/shared/Layout.tsx

@@ -1,5 +1,4 @@
 import React, { useState } from "react"
-import { Box, BoxProps } from "@chakra-ui/react"
 import { AnimatePresence, motion, Variants } from "framer-motion"
 import { useLocation, useOutlet } from "react-router-dom"
 import Header from "../Header"

dapp/src/router/index.tsx

@@ -4,7 +4,6 @@ import LandingPage from "#/pages/LandingPage"
 import Layout from "#/components/shared/Layout"
 import ActivityPage from "#/pages/ActivityPage"
 import DashboardPage from "#/pages/DashboardPage"
-import Layout from "#/components/shared/Layout"
 import { routerPath } from "./path"
 
 export function Router() {