3 files changed, 9 insertions, 7 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 5653358610..f89f0c699c 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1374,6 +1374,7 @@
 /zh-CN/docs/Web/API/HTMLHyperlinkElementUtils/toString	/zh-CN/docs/Web/API/HTMLAnchorElement/toString
 /zh-CN/docs/Web/API/HTMLHyperlinkElementUtils/username	/zh-CN/docs/Web/API/HTMLAnchorElement/username
 /zh-CN/docs/Web/API/HTMLTableElement.deleteTHead	/zh-CN/docs/Web/API/HTMLTableElement/deleteTHead
+/zh-CN/docs/Web/API/Headers/getAll	/zh-CN/docs/conflicting/Web/API/Headers/get
 /zh-CN/docs/Web/API/IDBCursor.direction	/zh-CN/docs/Web/API/IDBCursor/direction
 /zh-CN/docs/Web/API/IDBFactory.open	/zh-CN/docs/Web/API/IDBFactory/open
 /zh-CN/docs/Web/API/IDBObjectStore.openCursor	/zh-CN/docs/Web/API/IDBObjectStore/openCursor
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index d2764ca101..5b8e48f2d8 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -15885,12 +15885,6 @@
       "Taoja"
     ]
   },
-  "Web/API/Headers/getAll": {
-    "modified": "2019-03-23T22:15:47.321Z",
-    "contributors": [
-      "Taoja"
-    ]
-  },
   "Web/API/Headers/has": {
     "modified": "2019-03-18T21:43:54.084Z",
     "contributors": [
@@ -47245,6 +47239,12 @@
       "m2mbob"
     ]
   },
+  "conflicting/Web/API/Headers/get": {
+    "modified": "2019-03-23T22:15:47.321Z",
+    "contributors": [
+      "Taoja"
+    ]
+  },
   "conflicting/Web/API/MouseEvent/altKey": {
     "modified": "2019-03-24T00:16:10.184Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/headers/getall/index.html b/files/zh-cn/conflicting/web/api/headers/get/index.html
index a9a2d22e59..c4b5464f68 100644
--- a/files/zh-cn/web/api/headers/getall/index.html
+++ b/files/zh-cn/conflicting/web/api/headers/get/index.html
@@ -1,7 +1,8 @@
 ---
 title: Headers.getAll()
-slug: Web/API/Headers/getAll
+slug: conflicting/Web/API/Headers/get
 translation_of: Web/API/Headers/getAll
+original_slug: Web/API/Headers/getAll
 ---
 <p>{{APIRef("Fetch")}}{{ SeeCompatTable() }}</p>