docs(en): fix conflicts

Author: jacob-lcs

src/content/configuration/cache.mdx

@@ -441,35 +441,33 @@ module.exports = {
 };
 ```
 
-<<<<<<< HEAD
 W> 在具有不同选项的调用之间不要共享缓存。
-=======
-W> Don't share the cache between calls with different options.
 
-## Setup cache in CI/CD system
+## 在 CI/CD 系统中设置缓存 $#setup-cache-in-cicd-system$
 
+文件系统缓存允许在 CI 的构建之间共享缓存。为了设置设置缓存：
 Filesystem cache allows to share cache between builds in CI. To setup cache:
 
-- CI should have an option to share cache between builds.
-- CI should run job in the same absolute path. This is important since webpack cache files store absolute paths.
+- CI 应该有一个在构建之间共享缓存的配置项。
+- CI 应该在相同的绝对路径中运行任务。这非常重要，因为 webpack 缓存文件存储绝对路径。
 
 ### GitLab CI/CD
 
-Common config could looks like
+以下是一些通用配置
 
 ```yaml
 variables:
-  # fallback to use "main" branch cache, requires GitLab Runner 13.4
+  # 兜底使用 "main" 分支缓存，要求 GitLab Runner 版本为 13.4
   CACHE_FALLBACK_KEY: main
 
-# this is webpack build job
+# 这是 webpack 构建任务
 build-job:
   cache:
-    key: '$CI_COMMIT_REF_SLUG' # branch/tag name
+    key: '$CI_COMMIT_REF_SLUG' # 分支/tag 名称
     paths:
-      # cache directory
-      # make sure that you don't run "npm ci" in this job or change default cache directory
-      # otherwise "npm ci" will prune cache files
+      # 缓存文件夹
+      # 确保在这个任务中没有运行 "npm ci" 或者更改默认缓存文件夹
+      # 否则 "npm ci" 将会删除缓存文件
       - node_modules/.cache/webpack/
 ```
 
@@ -478,11 +476,10 @@ build-job:
 ```yaml
 - uses: actions/cache@v3
   with:
-    # cache directory
+    # 缓存文件夹
     path: node_modules/.cache/webpack/
     key: ${{ GITHUB_REF_NAME }}-webpack-build
-    # fallback to use "main" branch cache
+    # 兜底使用 "main" 分支缓存
     restore-keys: |
       main-webpack-build
 ```
->>>>>>> f61d17e8b8c5013d651e6c5e7e4d008fd374ec26