docs(en): fix conflicts

Author: jacob-lcs

src/content/blog/2020-10-10-webpack-5-release.mdx

@@ -100,11 +100,7 @@ webpack 是完全基于[赞助](https://opencollective.com/webpack)的。
 
 ### 不再为 Node.js 模块 自动引用 Polyfills {#automatic-nodejs-polyfills-removed}
 
-<<<<<<< HEAD:src/content/blog/2020-10-10-webpack-5-release.md
-在早期，webpack 的目的是为了让大多数的 Node.js 模块运行在浏览器中，但如今模块的格局已经发生了变化，现在许多模块主要是为前端而编写。webpack <= 4 的版本中提供了许多 Node.js 核心模块的 polyfills，一旦某个模块引用了任何一个核心模块（如 `cypto` 模块），webpack 就会自动引用这些 polyfills。
-=======
-In the early days, webpack's aim was to allow running most Node.js modules in the browser, but the module landscape changed and many module uses are now written mainly for frontend purposes. webpack &lt;= 4 ships with polyfills for many of the Node.js core modules, which are automatically applied once a module uses any of the core modules (i.e. the `crypto` module).
->>>>>>> adf6f27ad2c72a912693f9599d0f842fde48457f:src/content/blog/2020-10-10-webpack-5-release.mdx
+在早期，webpack 的目的是为了让大多数的 Node.js 模块运行在浏览器中，但如今模块的格局已经发生了变化，现在许多模块主要是为前端而编写。webpack &lt;= 4 的版本中提供了许多 Node.js 核心模块的 polyfills，一旦某个模块引用了任何一个核心模块（如 `cypto` 模块），webpack 就会自动引用这些 polyfills。
 
 尽管这会使得使用为 Node.js 编写模块变得容易，但它在构建时给 bundle 附加了庞大的 polyfills。在大部分情况下，这些 polyfills 并非必须。
 

src/content/branding.mdx

@@ -12,13 +12,9 @@ translators:
   - jacob-lcs
 ---
 
-<<<<<<< HEAD:src/content/branding.md
-在这里你可以找到 **webpack** 项目的品牌指南、资源和许可证。有关更多信息，请通过查看我们的官方[媒体仓库](https://github.com/webpack/media)，并找到[许可证](https://github.com/webpack/media/blob/master/LICENSE)来了解。点击任意图片下载它们。
-=======
 import BrandingSample from '../components/BrandingSample.jsx';
 
-Here you can find **webpack** project brand guidelines, assets, and license. See our official [media repository](https://github.com/webpack/media) for more information and to find the [license](https://github.com/webpack/media/blob/master/LICENSE) that governs this work. Click any of the images to download them.
->>>>>>> adf6f27ad2c72a912693f9599d0f842fde48457f:src/content/branding.mdx
+在这里你可以找到 **webpack** 项目的品牌指南、资源和许可证。有关更多信息，请通过查看我们的官方[媒体仓库](https://github.com/webpack/media)，并找到[许可证](https://github.com/webpack/media/blob/master/LICENSE)来了解。点击任意图片下载它们。
 
 ## 名称 {#the-name}
 
@@ -99,22 +95,7 @@ T> 对于那些遵循我们的指南，并已经深入了解的人，我们还
 
 在 [Open Collective](https://opencollective.com/) 和 [Threadless](https://medium.com/u/840563ee2a56) 的帮助下，以下颜色在我们整个网站中被以各种组合形式使用，并且在 [webpack 官方商城](https://webpack.threadless.com/collections/the-final-release-collection/) 推出的时尚服装系列中也用了这些颜色！
 
-<<<<<<< HEAD:src/content/branding.md
-| 颜色名称    | HEX 码      | RGB 码              | 示例 |
-| ------------ | ------------- | -------------------- | ---------------------------------------------------- |
-| Malibu:      | HEX `#8dd6f9` | `rgb: 141, 214, 249` | <div style="background-color: #8dd6f9;">&nbsp;</div> |
-| Denim:       | HEX `#1d78c1` | `rgb: 29, 120, 193`  | <div style="background-color: #1d78c1;">&nbsp;</div> |
-| Fiord:       | HEX `#465E69` | `rgb: 70, 94, 105`   | <div style="background-color: #465E69;">&nbsp;</div> |
-| Outer Space: | HEX `#2B3A42` | `rgb: 43, 58, 66`    | <div style="background-color: #2B3A42;">&nbsp;</div> |
-| White:       | HEX `#ffffff` | `rgb: 255, 255, 255` | <div style="background-color: #ffffff;">&nbsp;</div> |
-| Concrete:    | HEX `#f2f2f2` | `rgb: 242, 242, 242` | <div style="background-color: #f2f2f2;">&nbsp;</div> |
-| Alto:        | HEX `#dedede` | `rgb: 222, 222, 222` | <div style="background-color: #dedede;">&nbsp;</div> |
-| Dusty Gray:  | HEX `#999999` | `rgb: 153, 153, 153` | <div style="background-color: #999999;">&nbsp;</div> |
-| Dove Gray:   | HEX `#666666` | `rgb: 102, 102, 102` | <div style="background-color: #666666;">&nbsp;</div> |
-| Emperor:     | HEX `#535353` | `rgb: 83, 83, 83`    | <div style="background-color: #535353;">&nbsp;</div> |
-| Mine Shaft:  | HEX `#333333` | `rgb: 51, 51, 51`    | <div style="background-color: #333333;">&nbsp;</div> |
-=======
-| Color Name   | HEX Code      | RGB Code             | Sample                             |
+| 颜色名称   | HEX 码      | RGB 码             | 示例                             |
 | ------------ | ------------- | -------------------- | ---------------------------------- |
 | Malibu:      | HEX `#8dd6f9` | `rgb: 141, 214, 249` | <BrandingSample color='#8dd6f9' /> |
 | Denim:       | HEX `#1d78c1` | `rgb: 29, 120, 193`  | <BrandingSample color='#1d78c1' /> |
@@ -127,7 +108,6 @@ T> 对于那些遵循我们的指南，并已经深入了解的人，我们还
 | Dove Gray:   | HEX `#666666` | `rgb: 102, 102, 102` | <BrandingSample color='#666666' /> |
 | Emperor:     | HEX `#535353` | `rgb: 83, 83, 83`    | <BrandingSample color='#535353' /> |
 | Mine Shaft:  | HEX `#333333` | `rgb: 51, 51, 51`    | <BrandingSample color='#333333' /> |
->>>>>>> adf6f27ad2c72a912693f9599d0f842fde48457f:src/content/branding.mdx
 
 此外，你可以直接从下面的链接，获取这些类型的文件：
 

src/content/concepts/module-federation.mdx

@@ -369,14 +369,10 @@ new ModuleFederationPlugin({
 
 ### `Uncaught TypeError: fn is not a function`
 
-<<<<<<< HEAD
 此处错误可能是丢失了远程容器，请确保在使用前添加它。
 如果已为试图使用远程服务器的容器加载了容器，但仍然看到此错误，则需将主机容器的远程容器文件也添加到 HTML 中。
-=======
-You are likely missing the remote container, make sure it's added.
-If you have the container loaded for the remote you are trying to consume, but still see this error, add the host container's remote container file to the HTML as well.
 
-### Collision between modules from different remotes
+### 来自多个 remote 的模块之间的冲突 {#collision-between-modules-from-different-remotes}
 
+如果你想从不同的 remote 中加载多个模块，建议为你的远程构建设置 [`output.uniqueName`](/configuration/output/#outputuniquename) 以避免多个 webpack 运行时之间的冲突。
 If you're going to load multiple modules from different remotes, it's advised to set the [`output.uniqueName`](/configuration/output/#outputuniquename) option for your remote builds to avoid collisions between multiple webpack runtimes.
->>>>>>> adf6f27ad2c72a912693f9599d0f842fde48457f

src/content/concepts/plugins.mdx

@@ -34,11 +34,7 @@ const pluginName = 'ConsoleLogOnBuildWebpackPlugin';
 class ConsoleLogOnBuildWebpackPlugin {
   apply(compiler) {
     compiler.hooks.run.tap(pluginName, (compilation) => {
-<<<<<<< HEAD:src/content/concepts/plugins.md
-      console.log('webpack 构建过程开始！');
-=======
-      console.log('The webpack build process is starting!');
->>>>>>> adf6f27ad2c72a912693f9599d0f842fde48457f:src/content/concepts/plugins.mdx
+      console.log('webpack 构建正在启动！');
     });
   }
 }