chore: resolve conflicts

src/client/theme-default/components/VPNavBar.vue

@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { useWindowScroll } from '@vueuse/core'
-import { computed, onMounted, ref, watchPostEffect } from 'vue'
+import { ref, watchPostEffect } from 'vue'
 import { useData } from '../composables/data'
-import { useLocalNav } from '../composables/local-nav'
 import { useSidebar } from '../composables/sidebar'
 import VPNavBarAppearance from './VPNavBarAppearance.vue'
 import VPNavBarExtra from './VPNavBarExtra.vue'
@@ -23,7 +22,7 @@ defineEmits<{
 
 const { y } = useWindowScroll()
 const { hasSidebar } = useSidebar()
-const { hasLocalNav } = useLocalNav()
+// const { hasLocalNav } = useLocalNav()
 const { frontmatter } = useData()
 const navbar = ref<HTMLElement>()
 

src/client/theme-default/composables/sidebar.ts

@@ -18,7 +18,6 @@ import {
   getSidebarGroups
 } from '../support/sidebar'
 import { useData } from './data'
-import { hashRef } from './hash'
 import { inertControls } from './inert'
 
 export interface SidebarControl {