diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index e34eed818a2dd5..3ce73c2cfd505e 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3714,6 +3714,7 @@
 /ja/docs/Web/CSS/Using_media_queries_from_code	/ja/docs/Web/CSS/CSS_media_queries/Testing_media_queries
 /ja/docs/Web/CSS/Using_multi-column_layouts	/ja/docs/Web/CSS/CSS_multicol_layout/Using_multicol_layouts
 /ja/docs/Web/CSS/Using_multiple_backgrounds	/ja/docs/Web/CSS/CSS_backgrounds_and_borders/Using_multiple_backgrounds
+/ja/docs/Web/CSS/align-tracks	/ja/docs/conflicting/Web/CSS/CSS_grid_layout/Masonry_layout
 /ja/docs/Web/CSS/attr()	/ja/docs/Web/CSS/attr
 /ja/docs/Web/CSS/aural	/ja/docs/Web/CSS/@media/aural
 /ja/docs/Web/CSS/auto	/ja/docs/Web/CSS/width
@@ -3764,6 +3765,7 @@
 /ja/docs/Web/CSS/image/image()	/ja/docs/Web/CSS/image/image
 /ja/docs/Web/CSS/image/image-set()	/ja/docs/Web/CSS/image/image-set
 /ja/docs/Web/CSS/image/paint()	/ja/docs/Web/CSS/image/paint
+/ja/docs/Web/CSS/justify-tracks	/ja/docs/conflicting/Web/CSS/CSS_grid_layout/Masonry_layout_a8928831513575d277ecfe51dae84640
 /ja/docs/Web/CSS/linear-gradient	/ja/docs/Web/CSS/gradient/linear-gradient
 /ja/docs/Web/CSS/linear-gradient()	/ja/docs/Web/CSS/gradient/linear-gradient
 /ja/docs/Web/CSS/margin-new	/ja/docs/Web/CSS/margin
@@ -4147,6 +4149,7 @@
 /ja/docs/Web/HTTP/HTTP_access_control/Errors/CORSPreflightDidNotSucceed	/ja/docs/Web/HTTP/CORS/Errors/CORSPreflightDidNotSucceed
 /ja/docs/Web/HTTP/HTTP_access_control/Errors/CORSRequestNotHttp	/ja/docs/Web/HTTP/CORS/Errors/CORSRequestNotHttp
 /ja/docs/Web/HTTP/HTTP_response_codes	/ja/docs/Web/HTTP/Status
+/ja/docs/Web/HTTP/Headers/Accept-CH-Lifetime	/ja/docs/orphaned/Web/HTTP/Headers/Accept-CH-Lifetime
 /ja/docs/Web/HTTP/Headers/Content-Security-Policy/require-sri-for	/ja/docs/Web/HTTP/Headers/Content-Security-Policy
 /ja/docs/Web/HTTP/Headers/Feature-Policy	/ja/docs/Web/HTTP/Headers/Permissions-Policy
 /ja/docs/Web/HTTP/Headers/Feature-Policy/accelerometer	/ja/docs/Web/HTTP/Headers/Permissions-Policy/accelerometer
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 8504a9f9890cfe..a270366183c845 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -21640,10 +21640,6 @@
     "modified": "2020-10-15T22:28:37.603Z",
     "contributors": ["mfuji09", "tamura4278"]
   },
-  "Web/HTTP/Headers/Accept-CH-Lifetime": {
-    "modified": "2020-10-15T22:28:41.631Z",
-    "contributors": ["mfuji09", "Wind1808"]
-  },
   "Web/HTTP/Headers/Accept-Charset": {
     "modified": "2020-10-15T22:09:31.974Z",
     "contributors": ["mfuji09", "silverskyvicto"]
@@ -30616,6 +30612,10 @@
     "modified": "2020-09-18T02:40:01.125Z",
     "contributors": ["morinokami", "silverskyvicto"]
   },
+  "orphaned/Web/HTTP/Headers/Accept-CH-Lifetime": {
+    "modified": "2020-10-15T22:28:41.631Z",
+    "contributors": ["mfuji09", "Wind1808"]
+  },
   "orphaned/Web/JavaScript/Guide/Objects_and_Properties": {
     "modified": "2019-03-24T00:01:07.858Z",
     "contributors": ["ethertank", "happysadman", "electrolysis", "Mgjbot"]
diff --git a/files/ja/web/css/align-tracks/index.md b/files/ja/conflicting/web/css/css_grid_layout/masonry_layout/index.md
similarity index 97%
rename from files/ja/web/css/align-tracks/index.md
rename to files/ja/conflicting/web/css/css_grid_layout/masonry_layout/index.md
index 6887f2691b19df..41df7824fa276b 100644
--- a/files/ja/web/css/align-tracks/index.md
+++ b/files/ja/conflicting/web/css/css_grid_layout/masonry_layout/index.md
@@ -1,6 +1,7 @@
 ---
 title: align-tracks
-slug: Web/CSS/align-tracks
+slug: conflicting/Web/CSS/CSS_grid_layout/Masonry_layout
+original_slug: Web/CSS/align-tracks
 ---
 
 {{CSSRef}}
diff --git a/files/ja/web/css/justify-tracks/index.md b/files/ja/conflicting/web/css/css_grid_layout/masonry_layout_a8928831513575d277ecfe51dae84640/index.md
similarity index 96%
rename from files/ja/web/css/justify-tracks/index.md
rename to files/ja/conflicting/web/css/css_grid_layout/masonry_layout_a8928831513575d277ecfe51dae84640/index.md
index 79edf6be95898e..4cb9b8721e5ddd 100644
--- a/files/ja/web/css/justify-tracks/index.md
+++ b/files/ja/conflicting/web/css/css_grid_layout/masonry_layout_a8928831513575d277ecfe51dae84640/index.md
@@ -1,6 +1,7 @@
 ---
 title: justify-tracks
-slug: Web/CSS/justify-tracks
+slug: conflicting/Web/CSS/CSS_grid_layout/Masonry_layout_a8928831513575d277ecfe51dae84640
+original_slug: Web/CSS/justify-tracks
 ---
 
 {{CSSRef}}
diff --git a/files/ja/web/http/headers/accept-ch-lifetime/index.md b/files/ja/orphaned/web/http/headers/accept-ch-lifetime/index.md
similarity index 93%
rename from files/ja/web/http/headers/accept-ch-lifetime/index.md
rename to files/ja/orphaned/web/http/headers/accept-ch-lifetime/index.md
index cb8c0337b3be34..cd8340f11894e2 100644
--- a/files/ja/web/http/headers/accept-ch-lifetime/index.md
+++ b/files/ja/orphaned/web/http/headers/accept-ch-lifetime/index.md
@@ -1,6 +1,7 @@
 ---
 title: Accept-CH-Lifetime
-slug: Web/HTTP/Headers/Accept-CH-Lifetime
+slug: orphaned/Web/HTTP/Headers/Accept-CH-Lifetime
+original_slug: Web/HTTP/Headers/Accept-CH-Lifetime
 ---
 
 {{HTTPSidebar}}{{securecontext_header}}{{SeeCompatTable}}