docs(en): merging all conflicts

guide/assets.md

@@ -54,7 +54,17 @@ const worker = new Worker()
 ```
 
 ```js
+<<<<<<< HEAD
 // 内联为 base64 字符串
+=======
+// sharedworker
+import SharedWorker from './shader.js?sharedworker'
+const sharedWorker = new SharedWorker()
+```
+
+```js
+// Inlined as base64 strings
+>>>>>>> 540fde078f5d9d4eaf25ddf17e7eeda958734835
 import InlineWorker from './shader.js?worker&inline'
 ```
 

guide/build.md

@@ -92,7 +92,11 @@ module.exports = {
 }
 ```
 
+<<<<<<< HEAD
 如果你指定了另一个根目录，请记住，在解析输入路径时，`__dirname` 的值将仍然是 vite.config.js 文件所在的目录。因此，你需要把 `root` 的路径添加到 `resolve` 的参数中。
+=======
+If you specify a different root, remember that `__dirname` will still be the folder of your vite.config.js file when resolving the input paths. Therefore, you will need to add your `root` entry to the arguments for `resolve`.
+>>>>>>> 540fde078f5d9d4eaf25ddf17e7eeda958734835
 
 ## 库模式 {#library-mode}