diff --git a/streams/kr.m3u b/streams/kr.m3u
index f543d25a3f..31ed2d9b1c 100644
--- a/streams/kr.m3u
+++ b/streams/kr.m3u
@@ -111,13 +111,10 @@ https://allanf181.github.io/adaptive-streams/streams/kr/HoneyTV.m3u8
 https://allanf181.github.io/adaptive-streams/streams/kr/IBSports.m3u8
 #EXTINF:-1 tvg-id="iHQDrama.kr" status="online",iHQ drama (1080p) [Not 24/7]
 https://allanf181.github.io/adaptive-streams/streams/kr/iHQDrama.m3u8
-<<<<<<< HEAD
-=======
 #EXTINF:-1 tvg-id="JejuMBCTV.kr" status="error",제주 MBC (MBC Jeju) (352p) [Not 24/7]
 https://wowza.jejumbc.com/live/tv_jejumbc/playlist.m3u8
 #EXTINF:-1 tvg-id="JIBSTV.kr" status="online",JIBS SBS (720p) [Not 24/7]
 http://123.140.197.22/stream/1/play.m3u8
->>>>>>> master
 #EXTINF:-1 tvg-id="JTBC2.kr" status="online",JTBC2 (1080p) [Not 24/7]
 https://allanf181.github.io/adaptive-streams/streams/kr/JTBC2.m3u8
 #EXTINF:-1 tvg-id="JTBC4.kr" status="online",JTBC4 (1080p) [Not 24/7]