diff --git a/guide/cli.md b/guide/cli.md
index 2ee61ad7..6c428e37 100644
--- a/guide/cli.md
+++ b/guide/cli.md
@@ -106,7 +106,13 @@ vite optimize [root]
 
 本地预览构建产物。不要将其用作生产服务器，因为它不是为此而设计的。
 
+<<<<<<< HEAD
 #### 使用 {#usage-3}
+=======
+This command starts a server in the build directory (by default `dist`). Run `vite build` beforehand to ensure that the build directory is up-to-date. Depending on the project's configured [`appType`](/config/shared-options.html#apptype), it makes use of certain middleware.
+
+#### Usage
+>>>>>>> 43f06995143e60c47222c26ccf5d2ae387153409
 
 ```bash
 vite preview [root]
diff --git a/package.json b/package.json
index 86f84792..9c071358 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -39,4 +40,27 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
+=======
+  "name": "@vitejs/monorepo-docs",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "typecheck": "vue-tsc",
+    "docs": "vitepress dev",
+    "docs-build": "vitepress build",
+    "docs-serve": "vitepress serve"
+  },
+  "devDependencies": {
+    "@shikijs/vitepress-twoslash": "^3.13.0",
+    "@types/express": "^5.0.3",
+    "feed": "^5.1.0",
+    "gsap": "^3.13.0",
+    "markdown-it-image-size": "^15.0.1",
+    "vitepress": "^2.0.0-alpha.12",
+    "vitepress-plugin-group-icons": "^1.6.3",
+    "vitepress-plugin-llms": "^1.8.0",
+    "vue": "^3.5.22",
+    "vue-tsc": "^3.1.0"
+  }
+>>>>>>> 43f06995143e60c47222c26ccf5d2ae387153409
 }