diff --git a/package.json b/package.json
index 9f834a7f..ef3e5e9c 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "vue": "^3.5.40"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@antfu/eslint-config": "^9.2.0",
     "@antfu/ni": "^30.3.0",
     "@iconify-json/carbon": "^1.2.25",
@@ -31,6 +32,15 @@
     "@shikijs/vitepress-twoslash": "^4.3.1",
     "@types/node": "^26.1.2",
     "@unocss/reset": "^66.7.5",
+=======
+    "@antfu/ni": "^28.3.0",
+    "@iconify-json/carbon": "catalog:",
+    "@iconify-json/logos": "catalog:",
+    "@iconify/vue": "catalog:",
+    "@shikijs/transformers": "^4.4.1",
+    "@shikijs/vitepress-twoslash": "^4.4.1",
+    "@unocss/reset": "catalog:",
+>>>>>>> c18a924db951363778078c62e1a21ee37bfa2c18
     "@vite-pwa/assets-generator": "^1.0.2",
     "@vite-pwa/vitepress": "^1.1.0",
     "@vitejs/plugin-vue": "^6.0.8",
@@ -48,6 +58,10 @@
     "vite-plugin-pwa": "^1.3.0",
     "vitepress": "2.0.0-alpha.16",
     "vitepress-plugin-group-icons": "^1.7.6",
+<<<<<<< HEAD
+=======
+    "vitepress-plugin-llms": "^1.13.4",
+>>>>>>> c18a924db951363778078c62e1a21ee37bfa2c18
     "vitepress-plugin-tabs": "^0.9.1",
     "vitest": "^4.1.10",
     "workbox-window": "^7.4.1"