diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 72c86128802703..25cfae556b7c0f 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1332,6 +1332,7 @@
 /ja/docs/Glossary/Client_hints	/ja/docs/Web/HTTP/Client_hints
 /ja/docs/Glossary/Constant(定数)	/ja/docs/Glossary/Constant
 /ja/docs/Glossary/Constant（定数）	/ja/docs/Glossary/Constant
+/ja/docs/Glossary/DOS_attack	/ja/docs/conflicting/Glossary/Denial_of_Service
 /ja/docs/Glossary/DTD	/ja/docs/Glossary/Doctype
 /ja/docs/Glossary/Descriptor_(CSS)	/ja/docs/Glossary/CSS_Descriptor
 /ja/docs/Glossary/Empty_element	/ja/docs/Glossary/Void_element
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index a704f548494801..e77df9989f4261 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -590,10 +590,6 @@
     "modified": "2020-05-01T02:52:31.457Z",
     "contributors": ["TheSakuMa", "mfuji09", "sii", "lpcwww"]
   },
-  "Glossary/DOS_attack": {
-    "modified": "2020-01-07T12:39:20.859Z",
-    "contributors": ["Uemmra3", "mfuji09", "dskmori", "kadokura"]
-  },
   "Glossary/DTMF": {
     "modified": "2019-03-18T21:26:29.740Z",
     "contributors": ["Wind1808"]
@@ -30043,6 +30039,10 @@
     "modified": "2020-07-17T23:22:13.809Z",
     "contributors": ["papparapa", "silverskyvicto"]
   },
+  "conflicting/Glossary/Denial_of_Service": {
+    "modified": "2020-01-07T12:39:20.859Z",
+    "contributors": ["Uemmra3", "mfuji09", "dskmori", "kadokura"]
+  },
   "conflicting/Learn/JavaScript/Client-side_web_APIs/Fetching_data": {
     "modified": "2020-08-12T11:49:11.332Z",
     "contributors": [
diff --git a/files/ja/glossary/dos_attack/index.md b/files/ja/conflicting/glossary/denial_of_service/index.md
similarity index 95%
rename from files/ja/glossary/dos_attack/index.md
rename to files/ja/conflicting/glossary/denial_of_service/index.md
index 47eeaf209c5ef4..e3b192dcdcd87d 100644
--- a/files/ja/glossary/dos_attack/index.md
+++ b/files/ja/conflicting/glossary/denial_of_service/index.md
@@ -1,6 +1,7 @@
 ---
 title: DoS attack (DoS 攻撃)
-slug: Glossary/DOS_attack
+slug: conflicting/Glossary/Denial_of_Service
+original_slug: Glossary/DOS_attack
 l10n:
   sourceCommit: ada5fa5ef15eadd44b549ecf906423b4a2092f34
 ---