docs(cn): fix all conflicts

Author: ShenQingchuan

guide/api-hmr.md

@@ -93,15 +93,9 @@ if (import.meta.hot) {
   import.meta.hot.accept(
     ['./foo.js', './bar.js'],
     ([newFooModule, newBarModule]) => {
-<<<<<<< HEAD
-      // 只有当更新模块非空时，回调函数接收一个数组
+      // 只有当所更新的模块非空时，回调函数接收一个数组
       // 如果更新不成功（例如语法错误），则该数组为空
     }
-=======
-      // The callback receives an array where only the updated module is non null
-      // If the update was not successful (syntax error for ex.), the array is empty
-    },
->>>>>>> b487b176946a6940b8f77176b07b19eed975456c
   )
 }
 ```

guide/troubleshooting.md

@@ -51,29 +51,25 @@
 
 请注意，这些配置会持久作用，但需要 **重新启动**。
 
-<<<<<<< HEAD
-### 431 Request Header Fields Too Large {#431-request-header-fields-too-large}
-=======
-### Network requests stop loading
+### 网络请求停止加载 {#network-requests-stop-loading}
 
-When using a self-signed SSL certificate, Chrome ignores all caching directives and reloads the content. Vite relies on these caching directives.
+使用自签名SSL证书时，Chrome 会忽略所有缓存指令并重新加载内容。而 Vite 依赖于这些缓存指令。
 
-To resolve the problem use a trusted SSL cert.
+要解决此问题，请使用受信任的SSL证书。
 
-See: [Cache problems](https://helpx.adobe.com/mt/experience-manager/kb/cache-problems-on-chrome-with-SSL-certificate-errors.html), [Chrome issue](https://bugs.chromium.org/p/chromium/issues/detail?id=110649#c8)
+请查看：[缓存问题](https://helpx.adobe.com/mt/experience-manager/kb/cache-problems-on-chrome-with-SSL-certificate-errors.html) 和相关的 [Chrome issue](https://bugs.chromium.org/p/chromium/issues/detail?id=110649#c8)
 
 #### macOS
 
-You can install a trusted cert via the CLI with this command:
+您可以使用以下命令通过 CLI 安装受信任的证书：
 
 ```
 security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain-db your-cert.cer
 ```
 
-Or, by importing it into the Keychain Access app and updating the trust of your cert to "Always Trust."
+或者，通过将其导入 Keychain Access 应用程序并将您的证书的信任更新为“始终信任”。
 
-### 431 Request Header Fields Too Large
->>>>>>> b487b176946a6940b8f77176b07b19eed975456c
+### 431 Request Header Fields Too Large {#431-request-header-fields-too-large}
 
 当服务器或 WebSocket 服务收到一个较大的 HTTP 头，该请求可能会被遗落并且会显示下面这样的警告。
 
@@ -105,15 +101,11 @@ import './Foo.js' // 应该为 './foo.js'
 
 同时如果有依赖环，也会发生完全重载。要解决这个问题，请先尝试解决依赖循环。
 
-<<<<<<< HEAD
-## 构建 {#build}
-=======
-### High number of HMR updates in console
+### 控制台中大量热更新 {#high-number-of-hmr-updates-in-console}
 
 This can be caused by a circular dependency. To solve this, try breaking the loop.
 
-## Build
->>>>>>> b487b176946a6940b8f77176b07b19eed975456c
+## 构建 {#build}
 
 ### 构建产物因为 CORS 错误无法工作 {#built-file-does-not-work-because-of-cors-error}