chore: fix rebase conflicts

Author: orangelckc

apps/client/components/Navbar.vue

@@ -115,7 +115,7 @@ const HEADER_OPTIONS = [
 ];
 
 const isDarkMode = computed(() => darkMode.value === Theme.DARK);
-const isStickyNavBar = computed(() => ["index", "User-Setting"].includes(route.name as string));
+const isStickyNavBar = computed(() => ["index", "setting"].includes(route.name as string));
 const isScrolled = computed(() => y.value >= SCROLL_THRESHOLD);
 
 function handleLogout() {