3 files changed, 10 insertions, 9 deletions
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index 44d523c2ac..05d11bdcbd 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -210,13 +210,14 @@
 /ko/docs/Games/Tutorials/순수한_자바스크립트를_이용한_2D_벽돌깨기_게임/캔버스_생성과_그리기	/ko/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript/Create_the_Canvas_and_draw_on_it
 /ko/docs/Glossary/Client_hints	/ko/docs/Web/HTTP/Client_hints
 /ko/docs/Glossary/Header	/ko/docs/Glossary/HTTP_header
+/ko/docs/Glossary/Transmission_Control_Protocol_(TCP)	/ko/docs/conflicting/Glossary/TCP
 /ko/docs/Glossary/동적_프로그래밍_언어	/ko/docs/Glossary/Dynamic_programming_language
 /ko/docs/Glossary/배열	/ko/docs/Glossary/array
 /ko/docs/Glossary/불린	/ko/docs/Glossary/Boolean
 /ko/docs/Glossary/브라우저-컨텍스트	/ko/docs/Glossary/Browsing_context
 /ko/docs/Glossary/스코프	/ko/docs/Glossary/Scope
 /ko/docs/Glossary/식별자	/ko/docs/Glossary/Identifier
-/ko/docs/Glossary/전송_제어_프로토콜_(TCP)	/ko/docs/Glossary/Transmission_Control_Protocol_(TCP)
+/ko/docs/Glossary/전송_제어_프로토콜_(TCP)	/ko/docs/conflicting/Glossary/TCP
 /ko/docs/Glossary/캐시	/ko/docs/Glossary/Cache
 /ko/docs/HTML	/ko/docs/Web/HTML
 /ko/docs/HTML/Block-level_elements	/ko/docs/Web/HTML/Block-level_elements
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index e46548fc28..ddd5aa5b31 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -956,12 +956,6 @@
       "enfroze"
     ]
   },
-  "Glossary/Transmission_Control_Protocol_(TCP)": {
-    "modified": "2020-01-12T14:32:05.700Z",
-    "contributors": [
-      "doong-jo"
-    ]
-  },
   "Glossary/Truthy": {
     "modified": "2020-08-26T22:21:21.196Z",
     "contributors": [
@@ -17379,6 +17373,12 @@
       "limkukhyun"
     ]
   },
+  "conflicting/Glossary/TCP": {
+    "modified": "2020-01-12T14:32:05.700Z",
+    "contributors": [
+      "doong-jo"
+    ]
+  },
   "conflicting/Learn": {
     "modified": "2020-07-16T22:22:13.258Z",
     "contributors": [
diff --git a/files/ko/glossary/transmission_control_protocol_(tcp)/index.html b/files/ko/conflicting/glossary/tcp/index.html
index 072c3ccbb9..159b42fba0 100644
--- a/files/ko/glossary/transmission_control_protocol_(tcp)/index.html
+++ b/files/ko/conflicting/glossary/tcp/index.html
@@ -1,10 +1,10 @@
 ---
 title: 전송 제어 프로토콜
-slug: Glossary/Transmission_Control_Protocol_(TCP)
+slug: conflicting/Glossary/TCP
 tags:
   - 전송 제어 프로토콜
 translation_of: Glossary/Transmission_Control_Protocol_(TCP)
-original_slug: Glossary/전송_제어_프로토콜_(TCP)
+original_slug: Glossary/Transmission_Control_Protocol_(TCP)
 ---
 <p>TCP (Transmission Control Protocol)는 IP 네트워크의 두 컴퓨터 간의 연결 지향 통신을 위한 전송 계층 호스트 간 프로토콜입니다. TCP는 가상 포트를 사용하여 두 컴퓨터 간의 물리적 연결을 재사용 할 수 있는 가상 종단 간 연결을 만듭니다. TCP는 {{glossary ( 'HTTP')}} 및 {{glossary ( 'SMTP')}} (email)과 같은 상위 레벨 프로토콜 데이터를 캡슐화합니다.</p>