4 files changed, 23 insertions, 20 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 701804d446..90ff7ef11f 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -243,7 +243,7 @@
 /zh-CN/docs/DOM/ImageData	/zh-CN/docs/Web/API/ImageData
 /zh-CN/docs/DOM/KeyboardEvent	/zh-CN/docs/Web/API/KeyboardEvent
 /zh-CN/docs/DOM/MouseScrollEvent	/zh-CN/docs/Web/API/MouseScrollEvent
-/zh-CN/docs/DOM/MouseWheelEvent	/zh-CN/docs/Web/API/MouseWheelEvent
+/zh-CN/docs/DOM/MouseWheelEvent	/zh-CN/docs/conflicting/Web/API/WheelEvent
 /zh-CN/docs/DOM/MutationObserver	/zh-CN/docs/Web/API/MutationObserver
 /zh-CN/docs/DOM/Node	/zh-CN/docs/Web/API/Node
 /zh-CN/docs/DOM/Node.appendChild	/zh-CN/docs/Web/API/Node/appendChild
@@ -1389,6 +1389,7 @@
 /zh-CN/docs/Web/API/Location.replace	/zh-CN/docs/Web/API/Location/replace
 /zh-CN/docs/Web/API/MediaStream.addTrack	/zh-CN/docs/Web/API/MediaStream/addTrack
 /zh-CN/docs/Web/API/MouseEvent/which	/zh-CN/docs/conflicting/Web/API/UIEvent/which
+/zh-CN/docs/Web/API/MouseWheelEvent	/zh-CN/docs/conflicting/Web/API/WheelEvent
 /zh-CN/docs/Web/API/Navigator.battery	/zh-CN/docs/Web/API/Navigator/battery
 /zh-CN/docs/Web/API/Navigator.buildID	/zh-CN/docs/Web/API/Navigator/buildID
 /zh-CN/docs/Web/API/Navigator.cookieEnabled	/zh-CN/docs/Web/API/Navigator/cookieEnabled
@@ -2191,7 +2192,8 @@
 /zh-CN/docs/Web/WebGL/Getting_started_with_WebGL	/zh-CN/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
 /zh-CN/docs/Web/WebGL/用WebGL来画2D图形	/zh-CN/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
 /zh-CN/docs/Web/Web_Components/Custom_Elements	/zh-CN/docs/Web/Web_Components/Using_custom_elements
-/zh-CN/docs/Web/Web_Components/HTML导入	/zh-CN/docs/Web/Web_Components/HTML_Imports
+/zh-CN/docs/Web/Web_Components/HTML_Imports	/zh-CN/docs/conflicting/Web/Web_Components
+/zh-CN/docs/Web/Web_Components/HTML导入	/zh-CN/docs/conflicting/Web/Web_Components
 /zh-CN/docs/Web/XSLT/Elements	/zh-CN/docs/Web/XSLT/Element
 /zh-CN/docs/Web/媒体	/zh-CN/docs/Web/Media
 /zh-CN/docs/Web/媒体/Autoplay_guide	/zh-CN/docs/Web/Media/Autoplay_guide
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 704de457fd..d0bbfa5ee4 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -17277,13 +17277,6 @@
       "teoli"
     ]
   },
-  "Web/API/MouseWheelEvent": {
-    "modified": "2019-03-23T23:38:38.526Z",
-    "contributors": [
-      "ziyunfei",
-      "teoli"
-    ]
-  },
   "Web/API/MutationObserver": {
     "modified": "2020-10-15T21:21:10.567Z",
     "contributors": [
@@ -46366,14 +46359,6 @@
       "Fantasy_shao"
     ]
   },
-  "Web/Web_Components/HTML_Imports": {
-    "modified": "2020-10-15T21:47:50.577Z",
-    "contributors": [
-      "2A5F",
-      "xgqfrms-GitHub",
-      "jchnxu"
-    ]
-  },
   "Web/Web_Components/Using_custom_elements": {
     "modified": "2020-08-13T09:13:52.060Z",
     "contributors": [
@@ -47330,6 +47315,13 @@
       "Carrie zhxj"
     ]
   },
+  "conflicting/Web/API/WheelEvent": {
+    "modified": "2019-03-23T23:38:38.526Z",
+    "contributors": [
+      "ziyunfei",
+      "teoli"
+    ]
+  },
   "conflicting/Web/API/Window": {
     "modified": "2019-01-16T17:02:20.467Z",
     "contributors": [
@@ -48021,6 +48013,14 @@
       "liminjun"
     ]
   },
+  "conflicting/Web/Web_Components": {
+    "modified": "2020-10-15T21:47:50.577Z",
+    "contributors": [
+      "2A5F",
+      "xgqfrms-GitHub",
+      "jchnxu"
+    ]
+  },
   "conflicting/Web/Web_Components/Using_shadow_DOM": {
     "modified": "2019-03-23T22:29:42.834Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/mousewheelevent/index.html b/files/zh-cn/conflicting/web/api/wheelevent/index.html
index cc2d1e95ea..c5d60a279c 100644
--- a/files/zh-cn/web/api/mousewheelevent/index.html
+++ b/files/zh-cn/conflicting/web/api/wheelevent/index.html
@@ -1,7 +1,8 @@
 ---
 title: MouseWheelEvent
-slug: Web/API/MouseWheelEvent
+slug: conflicting/Web/API/WheelEvent
 translation_of: Web/API/MouseWheelEvent
+original_slug: Web/API/MouseWheelEvent
 ---
 <p>{{APIRef("DOM Events")}}{{ Non-standard_header() }}{{deprecated_header}}</p>
 
diff --git a/files/zh-cn/web/web_components/html_imports/index.html b/files/zh-cn/conflicting/web/web_components/index.html
index c9cc5bd9a0..2196d5894b 100644
--- a/files/zh-cn/web/web_components/html_imports/index.html
+++ b/files/zh-cn/conflicting/web/web_components/index.html
@@ -1,11 +1,11 @@
 ---
 title: HTML 导入（HTML Imports）
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
 tags:
   - HTML Imports
   - Web Components
 translation_of: Web/Web_Components/HTML_Imports
-original_slug: Web/Web_Components/HTML导入
+original_slug: Web/Web_Components/HTML_Imports
 ---
 <p>{{DefaultAPISidebar("Web Components")}}</p>