5 files changed, 30 insertions, 23 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 77ee25324e..7e1d111a54 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1447,6 +1447,8 @@
 /zh-CN/docs/Web/API/Position	/zh-CN/docs/Web/API/GeolocationPosition
 /zh-CN/docs/Web/API/Position/coords	/zh-CN/docs/Web/API/GeolocationPosition/coords
 /zh-CN/docs/Web/API/PositionError	/zh-CN/docs/Web/API/GeolocationPositionError
+/zh-CN/docs/Web/API/PositionOptions	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition
+/zh-CN/docs/Web/API/PositionOptions/timeout	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6
 /zh-CN/docs/Web/API/RandomSource/getRandomValues	/zh-CN/docs/Web/API/Crypto/getRandomValues
 /zh-CN/docs/Web/API/Response/克隆	/zh-CN/docs/Web/API/Response/clone
 /zh-CN/docs/Web/API/SVGPathElement/getTotalLength	/zh-CN/docs/Web/API/SVGGeometryElement/getTotalLength
@@ -1467,6 +1469,7 @@
 /zh-CN/docs/Web/API/Selection.isCollapsed	/zh-CN/docs/Web/API/Selection/isCollapsed
 /zh-CN/docs/Web/API/Selection.removeRange	/zh-CN/docs/Web/API/Selection/removeRange
 /zh-CN/docs/Web/API/Selection/从Document中删除	/zh-CN/docs/Web/API/Selection/deleteFromDocument
+/zh-CN/docs/Web/API/StorageEstimate	/zh-CN/docs/conflicting/Web/API/StorageManager/estimate
 /zh-CN/docs/Web/API/Streams_API/使用可读文件流	/zh-CN/docs/Web/API/Streams_API/Using_readable_streams
 /zh-CN/docs/Web/API/Streams_API/概念	/zh-CN/docs/Web/API/Streams_API/Concepts
 /zh-CN/docs/Web/API/Text.isElementContentWhitespace	/zh-CN/docs/Web/API/Text/isElementContentWhitespace
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 6c130b2ef9..c6bbd17c16 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -18744,20 +18744,6 @@
       "ldwformat"
     ]
   },
-  "Web/API/PositionOptions": {
-    "modified": "2019-03-23T22:19:15.525Z",
-    "contributors": [
-      "paigextl",
-      "hmzll",
-      "leolux"
-    ]
-  },
-  "Web/API/PositionOptions/timeout": {
-    "modified": "2019-03-23T22:19:18.285Z",
-    "contributors": [
-      "kameii"
-    ]
-  },
   "Web/API/ProgressEvent": {
     "modified": "2020-10-15T21:52:17.661Z",
     "contributors": [
@@ -20225,12 +20211,6 @@
       "AlexChao"
     ]
   },
-  "Web/API/StorageEstimate": {
-    "modified": "2019-03-18T21:31:04.064Z",
-    "contributors": [
-      "hhxxhg"
-    ]
-  },
   "Web/API/StorageEvent": {
     "modified": "2019-05-20T00:34:34.333Z",
     "contributors": [
@@ -47121,6 +47101,20 @@
       "teoli"
     ]
   },
+  "conflicting/Web/API/Geolocation/getCurrentPosition": {
+    "modified": "2019-03-23T22:19:15.525Z",
+    "contributors": [
+      "paigextl",
+      "hmzll",
+      "leolux"
+    ]
+  },
+  "conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6": {
+    "modified": "2019-03-23T22:19:18.285Z",
+    "contributors": [
+      "kameii"
+    ]
+  },
   "conflicting/Web/API/GlobalEventHandlers/ongotpointercapture": {
     "modified": "2019-03-18T21:45:48.501Z",
     "contributors": [
@@ -47259,6 +47253,12 @@
       "hibernake"
     ]
   },
+  "conflicting/Web/API/StorageManager/estimate": {
+    "modified": "2019-03-18T21:31:04.064Z",
+    "contributors": [
+      "hhxxhg"
+    ]
+  },
   "conflicting/Web/API/UIEvent/which": {
     "modified": "2019-03-18T21:11:17.379Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/positionoptions/index.html b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition/index.html
index 43932e7322..c0b2ecbe3e 100644
--- a/files/zh-cn/web/api/positionoptions/index.html
+++ b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition/index.html
@@ -1,6 +1,6 @@
 ---
 title: PositionOptions
-slug: Web/API/PositionOptions
+slug: conflicting/Web/API/Geolocation/getCurrentPosition
 tags:
   - API
   - Geolocation API
@@ -9,6 +9,7 @@ tags:
   - Reference
   - TopicStub
 translation_of: Web/API/PositionOptions
+original_slug: Web/API/PositionOptions
 ---
 <div>{{APIRef("Geolocation API")}}</div>
 
diff --git a/files/zh-cn/web/api/positionoptions/timeout/index.html b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html
index 0362db0249..5711639408 100644
--- a/files/zh-cn/web/api/positionoptions/timeout/index.html
+++ b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html
@@ -1,9 +1,11 @@
 ---
 title: PositionOptions.timeout
-slug: Web/API/PositionOptions/timeout
+slug: >-
+  conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6
 tags:
   - API
 translation_of: Web/API/PositionOptions/timeout
+original_slug: Web/API/PositionOptions/timeout
 ---
 <div>{{APIRef("Geolocation API")}}</div>
 
diff --git a/files/zh-cn/web/api/storageestimate/index.html b/files/zh-cn/conflicting/web/api/storagemanager/estimate/index.html
index 74e0fa95cc..10a5a7eba5 100644
--- a/files/zh-cn/web/api/storageestimate/index.html
+++ b/files/zh-cn/conflicting/web/api/storagemanager/estimate/index.html
@@ -1,7 +1,8 @@
 ---
 title: StorageEstimate
-slug: Web/API/StorageEstimate
+slug: conflicting/Web/API/StorageManager/estimate
 translation_of: Web/API/StorageEstimate
+original_slug: Web/API/StorageEstimate
 ---
 <div>{{securecontext_header}}{{APIRef("Storage")}}</div>