docs(en): merging all conflicts

Author: docschina-bot

package.json

@@ -106,7 +106,7 @@
     "http-server": "^14.1.1",
     "husky": "^8.0.1",
     "hyperlink": "^5.0.4",
-    "jest": "^28.1.2",
+    "jest": "^28.1.3",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
     "markdownlint": "^0.26.0",
@@ -157,7 +157,7 @@
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.3.0",
     "react-router-dom": "^6.3.0",
-    "react-spring": "^9.4.5",
+    "react-spring": "^9.5.0",
     "react-tiny-popover": "5",
     "react-use": "^17.4.0",
     "react-visibility-sensor": "^5.0.2",

src/content/configuration/module.mdx

@@ -537,7 +537,11 @@ module.exports = {
 
 `string`
 
+<<<<<<< HEAD
 指定模块应放置在哪个 layer。
+=======
+Specify the layer in which the module should be placed in. A group of modules could be united in one layer which could then be used in [split chunks](/plugins/split-chunks-plugin/#splitchunkslayer), [stats](/configuration/stats/#statsgroupmodulesbylayer) or [entry options](/configuration/entry-context/#entry-descriptor).
+>>>>>>> de1b0e4b16826ae2a2e713ba2766a0a82b19b91e
 
 **webpack.config.js**