docs(en): fix conflicts part 2

Author: QC-L

src/content/api/plugins.md

@@ -23,12 +23,7 @@ T> 关于编写插件的高级介绍，请移步：
 让我们首先从 tapable 工具开始，
 它为 webpack 插件接口提供了核心能力的。
 
-<<<<<<< HEAD
-
 ## Tapable {#tapable}
-=======
-## Tapable
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 这个小型库是 webpack 的一个核心工具，但也可用于其他地方，
 以提供类似的插件接口。
@@ -42,12 +37,7 @@ T> 关于编写插件的高级介绍，请移步：
 那些扩展自 `Tapable` 的对象（例如：compiler），
 以及其提供的钩子(hooks)和每个钩子的类型（例如：`同步钩子(SyncHook)`）值得关注。
 
-<<<<<<< HEAD
-
 ## 插件类型 {#plugin-types}
-=======
-## Plugin Types
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 根据使用不同的钩子(hooks)和 `tap` 方法，
 插件可以以多种不同的方式运行。
@@ -59,72 +49,43 @@ T> 关于编写插件的高级介绍，请移步：
 插件可能会以不同的方式运行。
 例如：当你钩入到 `编译(compile)` 阶段时，只有同步的 `tap` 方法可以使用。
 
-<<<<<<< HEAD
 ``` js
-compiler.hooks.compile.tap('MyPlugin', params => {
-  console.log('以同步方式触及 compile 钩子。');
-=======
-```js
 compiler.hooks.compile.tap('MyPlugin', (params) => {
-  console.log('Synchronously tapping the compile hook.');
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
+  console.log('以同步方式触及 compile 钩子。');
 });
 ```
 
 然而，对于可以使用 `AsyncHook` 的 `run` 阶段，
 则需使用 `tapAsync` 或 `tapPromise`（以及 `tap`）方法。
 
 ```js
-<<<<<<< HEAD
-compiler.hooks.run.tapAsync('MyPlugin', (source, target, routesList, callback) => {
-  console.log('以异步方式触及 run 钩子。');
-  callback();
-});
-
-compiler.hooks.run.tapPromise('MyPlugin', (source, target, routesList) => {
-  return new Promise(resolve => setTimeout(resolve, 1000)).then(() => {
-    console.log('以具有延迟的异步方式触及 run 钩子。');
-  });
-});
-
-compiler.hooks.run.tapPromise('MyPlugin', async (source, target, routesList) => {
-  await new Promise(resolve => setTimeout(resolve, 1000));
-  console.log('以具有延迟的异步方式触及 run 钩子。');
-});
-=======
 compiler.hooks.run.tapAsync(
   'MyPlugin',
   (source, target, routesList, callback) => {
-    console.log('Asynchronously tapping the run hook.');
+    console.log('以异步方式触及运行钩子。');
     callback();
   }
 );
 
 compiler.hooks.run.tapPromise('MyPlugin', (source, target, routesList) => {
   return new Promise((resolve) => setTimeout(resolve, 1000)).then(() => {
-    console.log('Asynchronously tapping the run hook with a delay.');
+    console.log('以异步的方式触发具有延迟操作的钩子。');
   });
 });
 
 compiler.hooks.run.tapPromise(
   'MyPlugin',
   async (source, target, routesList) => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
-    console.log('Asynchronously tapping the run hook with a delay.');
+    console.log('以异步的方式触发具有延迟操作的钩子。');
   }
 );
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 ```
 
 这些需求(story)的含义在于，
 我们可以有多种方式 hook 到 compiler 中，可以让各种插件都以合适的方式去运行。
 
-<<<<<<< HEAD
-
 ## 自定义钩子 {#custom-hooks}
-=======
-## Custom Hooks
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 为了便于其他插件的编译过程中可以 `tap` 到，则需要创建一个新的 hook，
 我们只需要简单的从 `tapable` 中 `require` 所需的 hook 类，并创建：

src/content/api/resolvers.md

@@ -16,12 +16,7 @@ contributors:
 在继续阅读之前，请确保你已经读过
  [`enhanced-resolve`](https://github.com/webpack/enhanced-resolve) 和 [`tapable`](/api/plugins/#tapable) 文档。
 
-<<<<<<< HEAD
-
 ## 类型 {#types}
-=======
-## Types
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 在 `compiler` 类中，提供了三种类型的内置解析器：
 
@@ -47,12 +42,7 @@ compiler.resolverFactory.hooks.resolver
 
 请参阅 [`enhanced-resolve` documentation](https://github.com/webpack/enhanced-resolve) 以获得钩子的完整列表以及它们的介绍。
 
-<<<<<<< HEAD
-
 ## 配置选项 {#configuration-options}
-=======
-## Configuration Options
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 上述解析器也可以
 利用 [`resolve`](/configuration/resolve/) or [`resolveLoader`](/configuration/resolve/#resolveloader) 选项，通过配置文件进行定制。这些选项允许

src/content/api/stats.mdx

@@ -20,12 +20,7 @@ npx webpack --profile --json=compilation-stats.json
 
 The `--json=compilation-stats.json` flag indicates to webpack that it should emit the `compilation-stats.json` containing the dependency graph and various other build information. Typically, the `--profile` flag is also added so that a `profile` section is added to each [`modules` object](#module-objects) containing module-specific compilation stats.
 
-<<<<<<< HEAD
-
 ## Structure {#structure}
-=======
-## Structure
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 The top-level structure of the output JSON file is fairly straightforward but there are a few nested data structures as well. Each nested structure has a dedicated section below to make this document more consumable. Note that you can click links within the top-level structure below to jump to relevant sections and documentation:
 
@@ -72,12 +67,7 @@ The top-level structure of the output JSON file is fairly straightforward but th
 }
 ```
 
-<<<<<<< HEAD
-
 ### Asset Objects {#asset-objects}
-=======
-### Asset Objects
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 Each `assets` object represents an `output` file emitted from the compilation. They all follow a similar structure:
 
@@ -104,12 +94,7 @@ Each `assets` object represents an `output` file emitted from the compilation. T
 
 T> Asset's `info` property is available since webpack v4.40.0
 
-<<<<<<< HEAD
-
 ### Chunk Objects {#chunk-objects}
-=======
-### Chunk Objects
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 Each `chunks` object represents a group of modules known as a [chunk](/glossary/#c). Each object follows the following structure:
 
@@ -154,12 +139,7 @@ The `chunks` object will also contain a list of `origins` describing how the giv
 }
 ```
 
-<<<<<<< HEAD
-
 ### Module Objects {#module-objects}
-=======
-### Module Objects
->>>>>>> 2a79b6b70d9af5bbff0bb3f044dcb2d575090ce5
 
 What good would these statistics be without some description of the compiled application's actual modules? Each module in the dependency graph is represented by the following structure: