diff --git a/apps/web-antd/src/bootstrap.ts b/apps/web-antd/src/bootstrap.ts
index 1be9bbe0..b6dbfa55 100644
--- a/apps/web-antd/src/bootstrap.ts
+++ b/apps/web-antd/src/bootstrap.ts
@@ -5,6 +5,7 @@ import { initStores } from '@vben/stores';
 import '@vben/styles';
 import '@vben/styles/antd';
 
+import { setupGlobalComponent } from '#/components/global';
 import { setupI18n } from '#/locales';
 
 import App from './app.vue';
@@ -13,6 +14,9 @@ import { router } from './router';
 async function bootstrap(namespace: string) {
   const app = createApp(App);
 
+  // 全局组件
+  setupGlobalComponent(app);
+
   // 国际化 i18n 配置
   await setupI18n(app);
 
diff --git a/apps/web-antd/src/components/global/index.ts b/apps/web-antd/src/components/global/index.ts
new file mode 100644
index 00000000..29d7cf94
--- /dev/null
+++ b/apps/web-antd/src/components/global/index.ts
@@ -0,0 +1,10 @@
+import type { App } from 'vue';
+
+import { Button as AButton } from 'ant-design-vue';
+
+/**
+ * 全局组件注册
+ */
+export function setupGlobalComponent(app: App) {
+  app.use(AButton);
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c171179..18d13c7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -131,7 +131,7 @@ importers:
     dependencies:
       '@tinymce/tinymce-vue':
         specifier: ^6.0.1
-        version: 6.0.1(vue@3.5.4(typescript@5.6.2))
+        version: 6.0.1(vue@3.5.6(typescript@5.6.2))
       '@vben/access':
         specifier: workspace:*
         version: link:../../packages/effects/access
@@ -178,27 +178,14 @@ importers:
         specifier: ^11.1.0
         version: 11.1.0(vue@3.5.6(typescript@5.6.2))
       ant-design-vue:
-<<<<<<< HEAD
-        specifier: ^4.2.3
-        version: 4.2.3(vue@3.5.4(typescript@5.6.2))
+        specifier: ^4.2.4
+        version: 4.2.4(vue@3.5.6(typescript@5.6.2))
       cropperjs:
         specifier: ^1.6.2
         version: 1.6.2
       crypto-js:
         specifier: ^4.2.0
         version: 4.2.0
-=======
-        specifier: ^4.2.4
-<<<<<<< HEAD
-<<<<<<< HEAD
-        version: 4.2.4(vue@3.5.4(typescript@5.6.2))
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
-=======
-        version: 4.2.4(vue@3.5.5(typescript@5.6.2))
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
-        version: 4.2.4(vue@3.5.6(typescript@5.6.2))
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
       dayjs:
         specifier: ^1.11.13
         version: 1.11.13
@@ -213,25 +200,16 @@ importers:
         version: 4.17.21
       pinia:
         specifier: 2.2.2
-<<<<<<< HEAD
-<<<<<<< HEAD
-        version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))
+        version: 2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))
       tinymce:
         specifier: ^7.3.0
         version: 7.3.0
-=======
-        version: 2.2.2(typescript@5.6.2)(vue@3.5.5(typescript@5.6.2))
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
-        version: 2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
       vue:
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
       vue-router:
-<<<<<<< HEAD
-        specifier: ^4.4.4
-        version: 4.4.4(vue@3.5.4(typescript@5.6.2))
+        specifier: ^4.4.5
+        version: 4.4.5(vue@3.5.6(typescript@5.6.2))
     devDependencies:
       '@types/crypto-js':
         specifier: ^4.2.2
@@ -241,19 +219,7 @@ importers:
         version: 4.17.12
       unplugin-vue-components:
         specifier: ^0.27.3
-        version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.4(typescript@5.6.2))
-=======
-        specifier: ^4.4.5
-<<<<<<< HEAD
-<<<<<<< HEAD
-        version: 4.4.5(vue@3.5.4(typescript@5.6.2))
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
-=======
-        version: 4.4.5(vue@3.5.5(typescript@5.6.2))
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
-        version: 4.4.5(vue@3.5.6(typescript@5.6.2))
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
+        version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3))(rollup@4.21.3)(vue@3.5.6(typescript@5.6.2))
 
   apps/web-ele:
     dependencies:
@@ -320,11 +286,7 @@ importers:
     devDependencies:
       unplugin-element-plus:
         specifier: ^0.8.0
-<<<<<<< HEAD
-        version: 0.8.0(rollup@4.21.2)(webpack-sources@3.2.3)
-=======
-        version: 0.8.0(rollup@4.21.3)
->>>>>>> bd6b724aaf9347c77881c307a2c9f8031f89d522
+        version: 0.8.0(rollup@4.21.3)(webpack-sources@3.2.3)
 
   apps/web-naive:
     dependencies:
@@ -418,7 +380,7 @@ importers:
         version: link:../internal/vite-config
       '@vite-pwa/vitepress':
         specifier: ^0.5.3
-        version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))
+        version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))
       vitepress:
         specifier: ^1.3.4
         version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)
@@ -679,25 +641,8 @@ importers:
   internal/vite-config:
     dependencies:
       '@intlify/unplugin-vue-i18n':
-<<<<<<< HEAD
-        specifier: ^4.0.0
-<<<<<<< HEAD
-        version: 4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))(webpack-sources@3.2.3)
-=======
-        version: 4.0.0(rollup@4.21.3)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))
->>>>>>> bd6b724aaf9347c77881c307a2c9f8031f89d522
-=======
         specifier: ^5.0.0
-<<<<<<< HEAD
-<<<<<<< HEAD
-        version: 5.0.0(@vue/compiler-dom@3.5.4)(eslint@9.10.0(jiti@1.21.6))(petite-vue-i18n@10.0.1(vue@3.5.4(typescript@5.6.2)))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.4(typescript@5.6.2)))(vue@3.5.4(typescript@5.6.2))
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
-=======
-        version: 5.0.0(@vue/compiler-dom@3.5.5)(eslint@9.10.0(jiti@1.21.6))(petite-vue-i18n@10.0.1(vue@3.5.5(typescript@5.6.2)))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.5(typescript@5.6.2)))(vue@3.5.5(typescript@5.6.2))
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
-        version: 5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(petite-vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
+        version: 5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)
       '@jspm/generator':
         specifier: ^2.3.1
         version: 2.3.1
@@ -1100,42 +1045,23 @@ importers:
         specifier: workspace:*
         version: link:../../types
       '@vueuse/integrations':
-<<<<<<< HEAD
-        specifier: ^11.0.3
-<<<<<<< HEAD
-        version: 11.0.3(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.4(typescript@5.6.2))
+        specifier: ^11.1.0
+        version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.6(typescript@5.6.2))
       codemirror:
         specifier: ^6.0.1
         version: 6.0.1(@lezer/common@1.2.1)
-=======
-        version: 11.0.3(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.5(typescript@5.6.2))
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
-        specifier: ^11.1.0
-        version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.6(typescript@5.6.2))
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
       vue:
-<<<<<<< HEAD
-<<<<<<< HEAD
-        specifier: 3.5.4
-        version: 3.5.4(typescript@5.6.2)
-      vue-codemirror6:
-        specifier: ^1.3.4
-        version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.4(typescript@5.6.2))
-      vue-json-pretty:
-        specifier: ^2.4.0
-        version: 2.4.0(vue@3.5.4(typescript@5.6.2))
-=======
-        specifier: 3.5.5
-        version: 3.5.5(typescript@5.6.2)
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
+      vue-codemirror6:
+        specifier: ^1.3.4
+        version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.6(typescript@5.6.2))
+      vue-json-pretty:
+        specifier: ^2.4.0
+        version: 2.4.0(vue@3.5.6(typescript@5.6.2))
       vue-router:
         specifier: ^4.4.5
         version: 4.4.5(vue@3.5.6(typescript@5.6.2))
@@ -1302,7 +1228,7 @@ importers:
         version: 2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))
       pinia-plugin-persistedstate:
         specifier: ^4.0.1
-        version: 4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)
+        version: 4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(webpack-sources@3.2.3)
       vue:
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
@@ -4319,7 +4245,7 @@ packages:
   '@tinymce/tinymce-vue@6.0.1':
     resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==}
     peerDependencies:
-      vue: 3.5.4
+      vue: 3.5.6
 
   '@tootallnate/once@1.1.2':
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
@@ -4411,6 +4337,9 @@ packages:
   '@types/node@12.20.55':
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
 
+  '@types/node@22.5.4':
+    resolution: {integrity: sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==}
+
   '@types/node@22.5.5':
     resolution: {integrity: sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==}
 
@@ -4666,24 +4595,36 @@ packages:
   '@vue/compiler-core@3.5.4':
     resolution: {integrity: sha512-oNwn+BAt3n9dK9uAYvI+XGlutwuTq/wfj4xCBaZCqwwVIGtD7D6ViihEbyYZrDHIHTDE3Q6oL3/hqmAyFEy9DQ==}
 
+  '@vue/compiler-core@3.5.5':
+    resolution: {integrity: sha512-ZrxcY8JMoV+kgDrmRwlDufz0SjDZ7jfoNZiIBluAACMBmgr55o/jTbxnyrccH6VSJXnFaDI4Ik1UFCiq9r8i7w==}
+
   '@vue/compiler-core@3.5.6':
     resolution: {integrity: sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==}
 
   '@vue/compiler-dom@3.5.4':
     resolution: {integrity: sha512-yP9RRs4BDLOLfldn6ah+AGCNovGjMbL9uHvhDHf5wan4dAHLnFGOkqtfE7PPe4HTXIqE7l/NILdYw53bo1C8jw==}
 
+  '@vue/compiler-dom@3.5.5':
+    resolution: {integrity: sha512-HSvK5q1gmBbxRse3S0Wt34RcKuOyjDJKDDMuF3i7NC+QkDFrbAqw8NnrEm/z7zFDxWZa4/5eUwsBOMQzm1RHBA==}
+
   '@vue/compiler-dom@3.5.6':
     resolution: {integrity: sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==}
 
   '@vue/compiler-sfc@3.5.4':
     resolution: {integrity: sha512-P+yiPhL+NYH7m0ZgCq7AQR2q7OIE+mpAEgtkqEeH9oHSdIRvUO+4X6MPvblJIWcoe4YC5a2Gdf/RsoyP8FFiPQ==}
 
+  '@vue/compiler-sfc@3.5.5':
+    resolution: {integrity: sha512-MzBHDxwZhgQPHrwJ5tj92gdTYRCuPDSZr8PY3+JFv8cv2UD5/WayH5yo0kKCkKfrtJhc39jNSMityHrkMSbfnA==}
+
   '@vue/compiler-sfc@3.5.6':
     resolution: {integrity: sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==}
 
   '@vue/compiler-ssr@3.5.4':
     resolution: {integrity: sha512-acESdTXsxPnYr2C4Blv0ggx5zIFMgOzZmYU2UgvIff9POdRGbRNBHRyzHAnizcItvpgerSKQbllUc9USp3V7eg==}
 
+  '@vue/compiler-ssr@3.5.5':
+    resolution: {integrity: sha512-oFasHnpv/upubjJEmqiTKQYb4qS3ziJddf4UVWuFw6ebk/QTrTUc+AUoTJdo39x9g+AOQBzhOU0ICCRuUjvkmw==}
+
   '@vue/compiler-ssr@3.5.6':
     resolution: {integrity: sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==}
 
@@ -4732,6 +4673,9 @@ packages:
   '@vue/shared@3.5.4':
     resolution: {integrity: sha512-L2MCDD8l7yC62Te5UUyPVpmexhL9ipVnYRw9CsWfm/BGRL5FwDX4a25bcJ/OJSD3+Hx+k/a8LDKcG2AFdJV3BA==}
 
+  '@vue/shared@3.5.5':
+    resolution: {integrity: sha512-0KyMXyEgnmFAs6rNUL+6eUHtUCqCaNrVd+AW3MX3LyA0Yry5SA0Km03CDKiOua1x1WWnIr+W9+S0GMFoSDWERQ==}
+
   '@vue/shared@3.5.6':
     resolution: {integrity: sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==}
 
@@ -8134,12 +8078,6 @@ packages:
   perfect-debounce@1.0.0:
     resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
 
-  petite-vue-i18n@10.0.1:
-    resolution: {integrity: sha512-Hx+eW/AduOS/C8j2SNRt65B0B+Su3y4Z3rLj1BSrApBcLt8UZu1bpb+dS7rNTSKh7X+0ZGUEgQsxGdk6PSlrBw==}
-    engines: {node: '>= 16'}
-    peerDependencies:
-      vue: 3.5.6
-
   picocolors@1.1.0:
     resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
 
@@ -9879,7 +9817,7 @@ packages:
     peerDependencies:
       '@babel/parser': ^7.15.8
       '@nuxt/kit': ^3.2.2
-      vue: 3.5.4
+      vue: 3.5.6
     peerDependenciesMeta:
       '@babel/parser':
         optional: true
@@ -10070,6 +10008,37 @@ packages:
     peerDependencies:
       vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
 
+  vite@5.4.4:
+    resolution: {integrity: sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || >=20.0.0
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+
   vite@5.4.6:
     resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -10156,7 +10125,7 @@ packages:
     resolution: {integrity: sha512-Gmu2t4Exz3pQdtAsb7wINREx2nswNW+FV+q8S1wmsmeC3OLio5RkybRLsErP1b8+suqsVD/7t0Cx/XmBpQnHJA==}
     engines: {yarn: '>=1.22.19'}
     peerDependencies:
-      vue: 3.5.4
+      vue: 3.5.6
 
   vue-component-type-helpers@2.1.6:
     resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==}
@@ -10184,19 +10153,14 @@ packages:
     peerDependencies:
       vue: 3.5.6
 
-<<<<<<< HEAD
   vue-json-pretty@2.4.0:
     resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==}
     engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
     peerDependencies:
-      vue: 3.5.4
+      vue: 3.5.6
 
-  vue-router@4.4.4:
-    resolution: {integrity: sha512-3MlnDqwRwZwCQVbtVfpsU+nrNymNjnXSsQtXName5925NVC1+326VVfYH9vSrA0N13teGEo8z5x7gbRnGjCDiQ==}
-=======
   vue-router@4.4.5:
     resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
     peerDependencies:
       vue: 3.5.6
 
@@ -11695,7 +11659,6 @@ snapshots:
     dependencies:
       mime: 3.0.0
 
-<<<<<<< HEAD
   '@codemirror/autocomplete@6.18.0(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.33.0)(@lezer/common@1.2.1)':
     dependencies:
       '@codemirror/language': 6.10.2
@@ -11812,10 +11775,7 @@ snapshots:
       style-mod: 4.1.2
       w3c-keyname: 2.2.8
 
-  '@commitlint/cli@19.5.0(@types/node@22.5.4)(typescript@5.6.2)':
-=======
   '@commitlint/cli@19.5.0(@types/node@22.5.5)(typescript@5.6.2)':
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
     dependencies:
       '@commitlint/format': 19.5.0
       '@commitlint/lint': 19.5.0
@@ -12797,7 +12757,7 @@ snapshots:
     dependencies:
       '@swc/helpers': 0.5.13
 
-  '@intlify/bundle-utils@9.0.0-beta.0(petite-vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))':
+  '@intlify/bundle-utils@9.0.0-beta.0(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))':
     dependencies:
       '@intlify/message-compiler': 10.0.0
       '@intlify/shared': 10.0.0
@@ -12809,7 +12769,6 @@ snapshots:
       source-map-js: 1.2.1
       yaml-eslint-parser: 1.2.3
     optionalDependencies:
-      petite-vue-i18n: 10.0.1(vue@3.5.6(typescript@5.6.2))
       vue-i18n: 10.0.1(vue@3.5.6(typescript@5.6.2))
 
   '@intlify/core-base@10.0.1':
@@ -12822,17 +12781,7 @@ snapshots:
       '@intlify/shared': 10.0.0
       source-map-js: 1.2.1
 
-<<<<<<< HEAD
-  '@intlify/shared@9.14.0': {}
-
-<<<<<<< HEAD
-  '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))(webpack-sources@3.2.3)':
-=======
-  '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.21.3)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))':
->>>>>>> bd6b724aaf9347c77881c307a2c9f8031f89d522
-=======
   '@intlify/message-compiler@10.0.1':
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
     dependencies:
       '@intlify/shared': 10.0.1
       source-map-js: 1.2.1
@@ -12841,10 +12790,10 @@ snapshots:
 
   '@intlify/shared@10.0.1': {}
 
-  '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(petite-vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))':
+  '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.21.3)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6))
-      '@intlify/bundle-utils': 9.0.0-beta.0(petite-vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))
+      '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))
       '@intlify/shared': 10.0.0
       '@intlify/vue-i18n-extensions': 6.2.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.6)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
@@ -12858,22 +12807,9 @@ snapshots:
       pathe: 1.1.2
       picocolors: 1.1.0
       source-map-js: 1.2.1
-<<<<<<< HEAD
       unplugin: 1.14.1(webpack-sources@3.2.3)
-=======
-      unplugin: 1.14.1
-<<<<<<< HEAD
-<<<<<<< HEAD
-      vue: 3.5.4(typescript@5.6.2)
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
-=======
-      vue: 3.5.5(typescript@5.6.2)
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
       vue: 3.5.6(typescript@5.6.2)
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
     optionalDependencies:
-      petite-vue-i18n: 10.0.1(vue@3.5.6(typescript@5.6.2))
       vue-i18n: 10.0.1(vue@3.5.6(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/compiler-dom'
@@ -13174,9 +13110,9 @@ snapshots:
       mkdirp: 1.0.4
       rimraf: 3.0.2
 
-  '@nuxt/kit@3.13.1(rollup@4.21.3)':
+  '@nuxt/kit@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)':
     dependencies:
-      '@nuxt/schema': 3.13.1(rollup@4.21.3)
+      '@nuxt/schema': 3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)
       c12: 1.11.2
       consola: 3.2.3
       defu: 6.1.4
@@ -13193,8 +13129,8 @@ snapshots:
       scule: 1.3.0
       semver: 7.6.3
       ufo: 1.5.4
-      unctx: 2.3.1
-      unimport: 3.11.1(rollup@4.21.3)
+      unctx: 2.3.1(webpack-sources@3.2.3)
+      unimport: 3.11.1(rollup@4.21.3)(webpack-sources@3.2.3)
       untyped: 1.4.2
     transitivePeerDependencies:
       - magicast
@@ -13202,7 +13138,7 @@ snapshots:
       - supports-color
       - webpack-sources
 
-  '@nuxt/schema@3.13.1(rollup@4.21.3)':
+  '@nuxt/schema@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)':
     dependencies:
       compatx: 0.1.8
       consola: 3.2.3
@@ -13214,7 +13150,7 @@ snapshots:
       std-env: 3.7.0
       ufo: 1.5.4
       uncrypto: 0.1.3
-      unimport: 3.11.1(rollup@4.21.3)
+      unimport: 3.11.1(rollup@4.21.3)(webpack-sources@3.2.3)
       untyped: 1.4.2
     transitivePeerDependencies:
       - rollup
@@ -13721,10 +13657,10 @@ snapshots:
       '@tanstack/virtual-core': 3.10.7
       vue: 3.5.6(typescript@5.6.2)
 
-  '@tinymce/tinymce-vue@6.0.1(vue@3.5.4(typescript@5.6.2))':
+  '@tinymce/tinymce-vue@6.0.1(vue@3.5.6(typescript@5.6.2))':
     dependencies:
       tinymce: 7.3.0
-      vue: 3.5.4(typescript@5.6.2)
+      vue: 3.5.6(typescript@5.6.2)
 
   '@tootallnate/once@1.1.2': {}
 
@@ -13819,6 +13755,10 @@ snapshots:
 
   '@types/node@12.20.55': {}
 
+  '@types/node@22.5.4':
+    dependencies:
+      undici-types: 6.19.8
+
   '@types/node@22.5.5':
     dependencies:
       undici-types: 6.19.8
@@ -13835,7 +13775,7 @@ snapshots:
 
   '@types/qrcode@1.5.5':
     dependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.5.4
 
   '@types/readdir-glob@1.1.5':
     dependencies:
@@ -14042,9 +13982,9 @@ snapshots:
       - encoding
       - supports-color
 
-  '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))':
+  '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))':
     dependencies:
-      vite-plugin-pwa: 0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0)
+      vite-plugin-pwa: 0.20.5(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0)
 
   '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))':
     dependencies:
@@ -14056,9 +13996,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.1.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))':
+  '@vitejs/plugin-vue@5.1.3(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))':
     dependencies:
-      vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
+      vite: 5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
       vue: 3.5.6(typescript@5.6.2)
 
   '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))':
@@ -14144,7 +14084,7 @@ snapshots:
       '@babel/helper-module-imports': 7.24.7
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/parser': 7.25.6
-      '@vue/compiler-sfc': 3.5.6
+      '@vue/compiler-sfc': 3.5.5
     transitivePeerDependencies:
       - supports-color
 
@@ -14156,6 +14096,14 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
+  '@vue/compiler-core@3.5.5':
+    dependencies:
+      '@babel/parser': 7.25.6
+      '@vue/shared': 3.5.5
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
+
   '@vue/compiler-core@3.5.6':
     dependencies:
       '@babel/parser': 7.25.6
@@ -14169,6 +14117,11 @@ snapshots:
       '@vue/compiler-core': 3.5.4
       '@vue/shared': 3.5.4
 
+  '@vue/compiler-dom@3.5.5':
+    dependencies:
+      '@vue/compiler-core': 3.5.5
+      '@vue/shared': 3.5.5
+
   '@vue/compiler-dom@3.5.6':
     dependencies:
       '@vue/compiler-core': 3.5.6
@@ -14186,6 +14139,18 @@ snapshots:
       postcss: 8.4.47
       source-map-js: 1.2.1
 
+  '@vue/compiler-sfc@3.5.5':
+    dependencies:
+      '@babel/parser': 7.25.6
+      '@vue/compiler-core': 3.5.5
+      '@vue/compiler-dom': 3.5.5
+      '@vue/compiler-ssr': 3.5.5
+      '@vue/shared': 3.5.5
+      estree-walker: 2.0.2
+      magic-string: 0.30.11
+      postcss: 8.4.47
+      source-map-js: 1.2.1
+
   '@vue/compiler-sfc@3.5.6':
     dependencies:
       '@babel/parser': 7.25.6
@@ -14203,6 +14168,11 @@ snapshots:
       '@vue/compiler-dom': 3.5.4
       '@vue/shared': 3.5.4
 
+  '@vue/compiler-ssr@3.5.5':
+    dependencies:
+      '@vue/compiler-dom': 3.5.5
+      '@vue/shared': 3.5.5
+
   '@vue/compiler-ssr@3.5.6':
     dependencies:
       '@vue/compiler-dom': 3.5.6
@@ -14248,7 +14218,7 @@ snapshots:
   '@vue/language-core@2.1.6(typescript@5.6.2)':
     dependencies:
       '@volar/language-core': 2.4.4
-      '@vue/compiler-dom': 3.5.6
+      '@vue/compiler-dom': 3.5.5
       '@vue/compiler-vue2': 2.7.16
       '@vue/shared': 3.5.6
       computeds: 0.0.1
@@ -14282,6 +14252,8 @@ snapshots:
 
   '@vue/shared@3.5.4': {}
 
+  '@vue/shared@3.5.5': {}
+
   '@vue/shared@3.5.6': {}
 
   '@vue/test-utils@2.4.6':
@@ -14422,13 +14394,13 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.6
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.3.6
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16786,7 +16758,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.6
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16802,7 +16774,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.6
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -18128,14 +18100,6 @@ snapshots:
 
   perfect-debounce@1.0.0: {}
 
-  petite-vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)):
-    dependencies:
-      '@intlify/core-base': 10.0.1
-      '@intlify/shared': 10.0.1
-      '@vue/devtools-api': 6.6.4
-      vue: 3.5.6(typescript@5.6.2)
-    optional: true
-
   picocolors@1.1.0: {}
 
   picomatch@2.3.1: {}
@@ -18148,9 +18112,9 @@ snapshots:
 
   pify@4.0.1: {}
 
-  pinia-plugin-persistedstate@4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3):
+  pinia-plugin-persistedstate@4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(webpack-sources@3.2.3):
     dependencies:
-      '@nuxt/kit': 3.13.1(rollup@4.21.3)
+      '@nuxt/kit': 3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)
       deep-pick-omit: 1.2.0
       defu: 6.1.4
       destr: 2.0.3
@@ -19209,7 +19173,7 @@ snapshots:
   socks-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.6
+      debug: 4.3.7
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -19904,13 +19868,9 @@ snapshots:
 
   unicorn-magic@0.1.0: {}
 
-<<<<<<< HEAD
-  unimport@3.11.1(rollup@4.21.2)(webpack-sources@3.2.3):
-=======
   unicorn-magic@0.3.0: {}
 
-  unimport@3.11.1(rollup@4.21.2):
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
+  unimport@3.11.1(rollup@4.21.2)(webpack-sources@3.2.3):
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.2)
       acorn: 8.12.1
@@ -19929,7 +19889,7 @@ snapshots:
       - rollup
       - webpack-sources
 
-  unimport@3.11.1(rollup@4.21.3):
+  unimport@3.11.1(rollup@4.21.3)(webpack-sources@3.2.3):
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       acorn: 8.12.1
@@ -19943,7 +19903,7 @@ snapshots:
       pkg-types: 1.2.0
       scule: 1.3.0
       strip-literal: 2.1.0
-      unplugin: 1.14.1
+      unplugin: 1.14.1(webpack-sources@3.2.3)
     transitivePeerDependencies:
       - rollup
       - webpack-sources
@@ -19989,11 +19949,7 @@ snapshots:
 
   universalify@2.0.1: {}
 
-<<<<<<< HEAD
-  unplugin-element-plus@0.8.0(rollup@4.21.2)(webpack-sources@3.2.3):
-=======
-  unplugin-element-plus@0.8.0(rollup@4.21.3):
->>>>>>> bd6b724aaf9347c77881c307a2c9f8031f89d522
+  unplugin-element-plus@0.8.0(rollup@4.21.3)(webpack-sources@3.2.3):
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       es-module-lexer: 1.5.4
@@ -20003,10 +19959,10 @@ snapshots:
       - rollup
       - webpack-sources
 
-  unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.4(typescript@5.6.2)):
+  unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3))(rollup@4.21.3)(vue@3.5.6(typescript@5.6.2)):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.0(rollup@4.21.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       chokidar: 3.6.0
       debug: 4.3.6
       fast-glob: 3.3.2
@@ -20015,9 +19971,10 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.12.2
-      vue: 3.5.4(typescript@5.6.2)
+      vue: 3.5.6(typescript@5.6.2)
     optionalDependencies:
       '@babel/parser': 7.25.6
+      '@nuxt/kit': 3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -20151,7 +20108,7 @@ snapshots:
   vite-node@2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.6
+      debug: 4.3.7
       pathe: 1.1.2
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
     transitivePeerDependencies:
@@ -20212,13 +20169,8 @@ snapshots:
   vite-plugin-inspect@0.8.7(rollup@4.21.3)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)):
     dependencies:
       '@antfu/utils': 0.7.10
-<<<<<<< HEAD
-      '@rollup/pluginutils': 5.1.0(rollup@4.21.2)
-      debug: 4.3.6
-=======
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       debug: 4.3.7
->>>>>>> bd6b724aaf9347c77881c307a2c9f8031f89d522
       error-stack-parser-es: 0.1.5
       fs-extra: 11.2.0
       open: 10.1.0
@@ -20237,6 +20189,17 @@ snapshots:
       picocolors: 1.1.0
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
 
+  vite-plugin-pwa@0.20.5(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0):
+    dependencies:
+      debug: 4.3.7
+      pretty-bytes: 6.1.1
+      tinyglobby: 0.2.6
+      vite: 5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
+      workbox-build: 7.1.1
+      workbox-window: 7.1.0
+    transitivePeerDependencies:
+      - supports-color
+
   vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0):
     dependencies:
       debug: 4.3.7
@@ -20272,13 +20235,25 @@ snapshots:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2)
       '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
       '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2)
-      '@vue/compiler-dom': 3.5.6
+      '@vue/compiler-dom': 3.5.5
       kolorist: 1.8.0
       magic-string: 0.30.11
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
     transitivePeerDependencies:
       - supports-color
 
+  vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0):
+    dependencies:
+      esbuild: 0.21.5
+      postcss: 8.4.47
+      rollup: 4.21.3
+    optionalDependencies:
+      '@types/node': 22.5.5
+      fsevents: 2.3.3
+      less: 4.2.0
+      sass: 1.79.1
+      terser: 5.32.0
+
   vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0):
     dependencies:
       esbuild: 0.21.5
@@ -20306,16 +20281,16 @@ snapshots:
       '@shikijs/core': 1.17.0
       '@shikijs/transformers': 1.17.0
       '@types/markdown-it': 14.1.2
-      '@vitejs/plugin-vue': 5.1.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))
+      '@vitejs/plugin-vue': 5.1.3(vite@5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))
       '@vue/devtools-api': 7.4.5
-      '@vue/shared': 3.5.6
+      '@vue/shared': 3.5.4
       '@vueuse/core': 11.1.0(vue@3.5.6(typescript@5.6.2))
       '@vueuse/integrations': 11.0.3(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.6(typescript@5.6.2))
       focus-trap: 7.5.4
       mark.js: 8.11.1
       minisearch: 7.1.0
       shiki: 1.17.0
-      vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
+      vite: 5.4.4(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
       vue: 3.5.6(typescript@5.6.2)
     optionalDependencies:
       postcss: 8.4.47
@@ -20391,11 +20366,11 @@ snapshots:
 
   vscode-uri@3.0.8: {}
 
-  vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.4(typescript@5.6.2)):
+  vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.6(typescript@5.6.2)):
     dependencies:
       codemirror: 6.0.1(@lezer/common@1.2.1)
-      vue: 3.5.4(typescript@5.6.2)
-      vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2))
+      vue: 3.5.6(typescript@5.6.2)
+      vue-demi: 0.14.10(vue@3.5.6(typescript@5.6.2))
     transitivePeerDependencies:
       - '@lezer/common'
       - '@vue/composition-api'
@@ -20426,23 +20401,11 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.6(typescript@5.6.2)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-  vue-json-pretty@2.4.0(vue@3.5.4(typescript@5.6.2)):
+  vue-json-pretty@2.4.0(vue@3.5.6(typescript@5.6.2)):
     dependencies:
-      vue: 3.5.4(typescript@5.6.2)
+      vue: 3.5.6(typescript@5.6.2)
 
-  vue-router@4.4.4(vue@3.5.4(typescript@5.6.2)):
-=======
-  vue-router@4.4.5(vue@3.5.4(typescript@5.6.2)):
->>>>>>> 10b90eae5d915d0289fe9dcad95eed71bfd35f34
-=======
-  vue-router@4.4.5(vue@3.5.5(typescript@5.6.2)):
->>>>>>> d99cad35d7dc6792510cb7b86ea96906a12fda58
-=======
   vue-router@4.4.5(vue@3.5.6(typescript@5.6.2)):
->>>>>>> 26d43ef822c83c4850fc5b74430333711131eabf
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.6(typescript@5.6.2)