diff --git a/data/channels.csv b/data/channels.csv
index 1035a232..801262ef 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -972,9 +972,14 @@ AlArabiyaBusiness.sa,Al Arabiya Business,الأسواق العربية,,MBC Grou
 AlarabiyaPortrait.ae,Alarabiya Portrait,العربية عامودي,,,AE,,Dubai,c/AE,ara,news,FALSE,,,,https://www.alarabiya.net,https://i.imgur.com/NXFkYFj.png
 AlArabyTV.qa,Al Araby TV,العربي,Al Araby,Al Araby,QA,,Lusail,r/ARAB;r/MAGHREB,ara,news,FALSE,2015-01-01,,,https://www.alaraby.com/,https://i.imgur.com/YMqWEe4.png
 AlArabyTV2.qa,Al Araby TV 2,العربي 2,Al Araby,Al Araby,QA,,Lusail,r/ARAB;r/MAGHREB,ara,news,FALSE,2015-01-01,,,https://www.alaraby.com/alaraby2,https://i.imgur.com/Gp5mNea.png
+AlassemaTV.eg,Alassema TV,,,,EG,,,c/EG,ara,religious,FALSE,,,,,https://i.imgur.com/pInV6jp.png
 AlaToo24.kg,Ala-Too 24,Ала-Тоо 24;УТРК Ала-Тоо 24;КТРК Ала-Тоо 24,,National Broadcasting Corporation of the Kyrgyz Republic,KG,,Bishkek,r/CAS,kir;rus,news,FALSE,2016-09-12,,,https://www.utrk.kg/kg/live/tv?channel=42,https://i.imgur.com/vBPmUQA.png
 Alaune.fr,A la une,,,Vivendi,FR,,Issy-les-Moulineaux,c/FR,fra,entertainment,FALSE,1984-11-04,,,http://www.canalsat.fr/,https://i.imgur.com/mfsb0zf.png
 AlauTV.kz,Alau TV,,,,KZ,,Kostanay,c/KZ,kaz,,FALSE,,,,,https://i.imgur.com/gK6ZRzp.png
+<<<<<<< HEAD
+=======
+AlawlaTV.iq,Alawla TV,قناة الاولى العراقية,,,IQ,,Baghdad,c/IQ,ara,general,FALSE,2023-04-01,,,https://alawla.tv/live.html,https://i.ytimg.com/vi/ojAKgy0fZPE/hqdefault.jpg
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AlAyyamTV.iq,Al Ayyam TV,,,,IQ,,,c/IQ,ara,,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/al-ayam-tv.png
 AlbaCarolinaTV.ro,Alba Carolina TV,Carolina TV,,,RO,,Alba Iulia,c/RO,ron,general,FALSE,,,,https://www.carolinatv.ro/,https://i.imgur.com/RyOsV0g.png
 AlBaghdadia1.iq,Al-Baghdadia 1,البغدادية 1,,Awn Hussain Al Khashlok,IQ,,,c/IQ,ara,news,FALSE,2005-09-12,,,https://albaghdadiatv.com/,https://i.imgur.com/cI8uw7D.png
@@ -1048,6 +1053,7 @@ AlGhadTV.eg,Al Ghad TV,قناة الغد,,,EG,,Giza,c/EG,ara,news,FALSE,,,,https
 Alghadye.ye,Alghadye, قناة الغد المشرق,,,YE,,,c/YE,ara,news,FALSE,,,,http://www.alghadye.com/,https://i.imgur.com/yk5SVEq.png
 AlHadath.sa,Al Hadath,قناة الحدث,,,SA,,Riyadh,c/AE,ara,news,FALSE,2012-01-12,,,https://www.alhadath.net/,https://i.imgur.com/De4SEWE.png
 AlHadathAlyoum.eg,AlHadath Alyoum,-الحدث اليوم,,,EG,,,c/EG,ara,news,FALSE,,,,https://helyoum.com/,https://i.imgur.com/R7CJnPG.png
+AlHakikaTV.jo,Al Hakika TV,,,,JO,,,c/JO,ara,religious,FALSE,,,,,https://i.imgur.com/I9SJ2kr.jpg
 AlhaqeqaAldawlia.jo,Alhaqeqa Aldawlia,نقاش المستخدم,,,JO,,Amman,c/JO,ara,news,FALSE,,,,https://www.factjo.com/Pages.aspx?id=6,https://www.lyngsat.com/logo/tv/aa/alhaqeqa-aldawlia-jo.png
 AlHawyah.ye,Al-Hawyah,قناة الهوية,,,YE,,,c/YE,ara,,FALSE,,,,,https://i.imgur.com/PbzccXt.png
 AlhayatDrama.eg,Alhayat Drama,Alhayah Mosalsalat;Al Hayat Series;الحياة دراما;الحياة مسلسلات,,El Hayah Group,EG,,Cairo,c/EG,ara,series,FALSE,,,,https://elcinema.com/en/tvguide/1138/,https://i.imgur.com/vVM7I4a.png
@@ -1075,6 +1081,7 @@ AlIrshaadTV.ng,Al-Irshaad TV,,,,NG,,Jos,c/NG,ara,,FALSE,,,,,https://i.imgur.com/
 AlistiqamaTV.om,Alistiqama TV,قناة الاستقامة الفضائية,,,OM,,Seeb,c/OM,ara,religious,FALSE,,,,http://www.istiqama.tv/,https://i.imgur.com/2FPtYZr.png
 AliteiaTV.gr,Aliteia TV,,,,GR,,,c/GR,ell,,FALSE,,,,,https://i.imgur.com/Ynb1Xk7.png
 AlIttihadTV.lb,Al Ittihad TV,قناة الاتحاد,,,LB,,Beirut,c/LB,ara,general,FALSE,,,,http://www.alittihad.tv/,https://i.imgur.com/QMUjPXx.png
+AliwChannel23.ph,Aliw Channel 23,,,Aliw Broadcasting Corporation,PH,,Pasig City,c/PH,fil;eng,general,FALSE,2022-11-18,,,,https://i.imgur.com/8q1BkZ3.png
 Alizes.gp,Alizes,Alizés,,,GP,,,c/GP,fra,general,FALSE,,,,https://www.alizes.com/,https://i.imgur.com/Ximon65.png
 AlJadeed.lb,Al Jadeed,الجديد,,Tahseen Khayat,LB,,Beirut,c/LB,ara,general,FALSE,1992-01-01,,,https://www.aljadeed.tv/,https://i.imgur.com/CfxR8o3.png
 AlJanoubiyaTV.tn,Al Janoubiya TV,قناة الجنوبية,,Mohamed Ayachi Ajroudi,TN,,Tunis,c/TN,ara,general,FALSE,2012-03-20,,,https://ar.aljanoubiyatv.net/,https://i.imgur.com/w1bZdap.png
@@ -1131,12 +1138,21 @@ AllahdhahTV.ye,Allahdhah TV,,,,YE,,,c/YE,ara,,FALSE,,,,,https://i.imgur.com/v9VO
 AllAnal.ca,AllAnal,,,KB Productions LLC,CA,CA-ON,Toronto,c/CA,eng,xxx,TRUE,,,,https://tour.allanal.com/,https://i.imgur.com/5SaXxGw.png
 AllAnalAllTheTime.us,All Anal All The Time,,,,US,,,c/US,eng,xxx,TRUE,,,,https://www.allanalallthetime.com/,https://i.imgur.com/3mrG9GT.png
 ALLBLKGems.us,ALLBLK Gems,,,RLJ Entertainment Inc,US,US-CA,Woodland Hills,c/US,eng,entertainment,FALSE,2014-11-01,,,https://allblk.tv/,https://i.imgur.com/gnkepQJ.png
+<<<<<<< HEAD
+=======
+AllegroHD.ar,Allegro HD,,,Grupo Eurochannel,AR,,Buenos Aires,c/AR;r/LATAM,spa,music,FALSE,,,,https://allegrohd.com/,https://i.imgur.com/bRH34Rn.png
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AllegroWebTV.br,Allegro WebTV,,,,BR,BR-MG,Diamantina,s/BR-MG,por,general,FALSE,,,,https://allegrowebtv.com.br/,https://i.imgur.com/7iSmccE.png
 AllEliteWrestling.us,All Elite Wrestling,,,Tony Khan,US,US-FL,Jacksonville,c/US,spa,sports,FALSE,2019-01-01,,,https://www.allelitewrestling.com/,https://i.imgur.com/5YO1phG.png
 AlleluiaWorldTV.bj,Alleluia World TV,Alléluia World TV,,,BJ,,Cotonou,c/BJ,fra,religious,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/alleluia_world_tv.png
 AllenCityTV.us,Allen City TV,ACTV,,,US,US-TX,Allen,s/US-TX,eng,general,FALSE,,,,https://actv.org/CablecastPublicSite/watch-now?site=1,https://i.imgur.com/tX18djm.png
 AllendeTV.mx,Allende TV,,,Jesús Aranday Quiroz,MX,MX-DUR,Ignacio Allende,c/MX,spa,general,FALSE,,,,,https://i.imgur.com/6UyR11Y.jpg
+<<<<<<< HEAD
 AllgauTV.de,Allgau TV,Allgäu TV,,,DE,,Kempten,c/DE,deu,general,FALSE,,,,https://www.allgäu.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/8/8e/Allg%C3%A4u_TV_Logo_%282021%29.svg/512px-Allg%C3%A4u_TV_Logo_%282021%29.svg.png
+=======
+AllgauTV.de,Allgau TV,Allgäu TV,,,DE,,Kempten,c/DE,deu,general,FALSE,,,,https://www.xn--allgu-jra.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/8/8e/Allg%C3%A4u_TV_Logo_%282021%29.svg/512px-Allg%C3%A4u_TV_Logo_%282021%29.svg.png
+AllPlayEnt.id,All Play Ent,Usee Prime;AllPlay Ent,,,ID,,,c/ID,ind,,FALSE,,,UseePrime.id,https://www.indihometv.com/,https://i.postimg.cc/K8yShFYn/1200px-All-Play-Entertainment.png
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AllRealitybyWEtv.us,All Reality by WE tv,,Pluto TV,,US,,,c/US,eng,series,FALSE,,,,https://pluto.tv/en/live-tv/all-reality-by-we-tv,https://i.imgur.com/HZTz5HJ.png
 AllSports.br,All Sports,,,,BR,,,c/BR,por,sports,FALSE,,,,,https://i.imgur.com/wULpnYR.png
 AllSportsTVNetwork.us,All Sports TV Network,,,,US,US-CA,Glendale,c/US,eng,sports,FALSE,,,,https://www.all-sportstv.net/,https://i.imgur.com/qHwCima.jpg
@@ -1187,6 +1203,10 @@ AlNadaTV.eg,Al Nada TV,,,,EG,,Giza,c/EG,ara,,FALSE,,,,http://alnada.tv/,https://
 AlNaeemTV.iq,Al-Naeem TV,قناة النعيم,,,IQ,,Basra,c/IQ,ara,,FALSE,,,,https://www.alnaeem-tv.iq/,https://i.imgur.com/JyWjfIB.png
 AlNahar.eg,Al-Nahar,النهار,,Trenta for Art Production and Distribution,EG,,Cairo,c/EG,ara,general,FALSE,2011-06-30,,,https://www.al-nahar.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/AL_NAHAR_TV_NEW_LOGO.png/512px-AL_NAHAR_TV_NEW_LOGO.png
 AlNaharDrama.eg,Al-Nahar Drama,النهار دراما,,Trenta for Art Production and Distribution,EG,,Cairo,c/EG,ara,series,FALSE,2011-08-01,,,https://www.al-nahar.tv/,https://i.imgur.com/ieckdoE.png
+<<<<<<< HEAD
+=======
+AlNaharNoor.eg,Al-Nahar Noor,,,,EG,,,c/EG,ara,religious,FALSE,,,,,https://i.imgur.com/rTnL8EE.png
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AlNajahNews.ps,Al Najah News,النجاح الإخباري,,,PS,,Nablus,c/PS,ara,news,FALSE,,,,https://nn.najah.edu,https://i.imgur.com/c2bwn4G.png
 AlNassrTV.td,Al Nassr TV,,,,TD,,,c/TD,fra,,FALSE,,,,,https://i.imgur.com/DnYXwsr.png
 AlNassrTV24.td,Al Nassr TV 24,,,,TD,,,c/TD,fra,news,FALSE,,,,,https://i.imgur.com/CaizvLC.png
@@ -1221,7 +1241,7 @@ AlRayyanOldTV.qa,Al Rayyan Old TV,,,Al Rayyan Media,QA,,Doha,c/QA,ara,general,FA
 AlRayyanTV.qa,Al Rayyan TV,الريان,,Al Rayyan Media,QA,,Doha,c/QA,ara,general,FALSE,2011-01-01,,,https://www.alrayyan.tv/,https://i.imgur.com/Ts3RjTV.png
 AlResalah.sa,Al Resalah,الرساله,,Prince Al-Waleed bin Talal,SA,,Cairo,c/SA,ara,religious,FALSE,2006-03-01,,,https://www.alresalah.net/,https://i.imgur.com/7o4HgrP.png
 AlResalahInternational.sa,Al Resalah International,قناة رسالة الدولية,,Prince Al-Waleed bin Talal,SA,,Cairo,c/SA,ara,religious,FALSE,2006-03-01,,,https://www.alresalah.net/,https://i.imgur.com/6RRTqIV.png
-AlRiyadhRadio.sa,Al Riyadh Radio,إذاعة الرياض,,,SA,,Riyadh,c/SA,ara,al riyadh radio ,FALSE,,,,https://www.aloula.sa/en/live/riyadhradio,https://i.imgur.com/8PH1Lak.png
+AlRiyadhRadio.sa,Al Riyadh Radio,إذاعة الرياض,,,SA,,Riyadh,c/SA,ara,,FALSE,,,,https://www.aloula.sa/en/live/riyadhradio,https://i.imgur.com/8PH1Lak.png
 AlSabah.kw,Al Sabah,Prince Al-Waleed bin Talal,,الصباح,KW,,Kuwait City,c/KW,ara,news,FALSE,,,,https://www.alsabahpress.com/,https://i.imgur.com/5fujkfE.png
 Alsace20.fr,Alsace 20,,,Alice Media,FR,,Strasbourg,c/CH;c/FR,fra,general,FALSE,2006-01-01,,,https://www.bfmtv.com/alsace/,https://i.imgur.com/2GqJf6f.png
 AlsaciasTelevision.hn,Alsacias Television,Alsacias Televisión,,,HN,,La Entrada,c/HN,spa,general,FALSE,,,,https://www.atv.hn/,https://i.imgur.com/SbuD1UW.png
@@ -1246,6 +1266,7 @@ AlSunnahAlNabawiyahTV.sa,Al Sunnah Al Nabawiyah TV,,,Saudi Broadcasting Authorit
 AltaghierTV.jo,Altaghier TV,قناة التغيير الفضائية,,,JO,,Amman,c/JO,ara,news,FALSE,,,,https://altaghier.tv/,https://i.imgur.com/YTyCBvB.png
 Altai.kz,Altai,,,,KZ,,Ust-Kamenogorsk,c/KZ,kaz,general,FALSE,,,,https://altaitv.kz/ru,https://i.imgur.com/AkcXXw5.png
 AltaleaaTV.iq,Altaleaa TV,,,,IQ,,Baghdad,c/IQ,ara,,FALSE,,,,,https://i.imgur.com/Uo5NaLZ.png
+AltantoTV.do,Altanto TV,,,,DO,,,c/DO,spa,general,FALSE,,,,https://altanto.com.do/,https://i.imgur.com/KWvVLhc.png
 AltasTV.tr,Altas TV,,,,TR,,Ankara,c/TR,tur,general,FALSE,,,,http://www.altastv.com.tr/,https://i.imgur.com/XaJ7fp6.png
 AltenaTV.nl,Altena TV,,,Altena Group B.V.,NL,,Waalwijk,c/NL,nld,,FALSE,,,,,https://i.imgur.com/0wblu0I.png
 AltenburgTV.de,Altenburg TV,,,,DE,,Altenburg,c/DE,deu,general,FALSE,,,,https://www.altenburg.tv/,https://i.imgur.com/3JriZGR.png
@@ -1259,6 +1280,7 @@ AltitudeSports.us,Altitude Sports,,,Kroenke Sports & Entertainment,US,US-CO,Denv
 AltoAdigeTV.it,AltoAdige TV,,,,IT,,Bolzano,c/IT,ita,general,FALSE,,,,https://www.altoadigetv.it/,https://i.imgur.com/yt7JJrn.png
 AltoNivelRadio.pe,Alto Nivel Radio,,,,PE,PE-CAL,,c/PE,spa,music,FALSE,,,,https://altonivelperuradio.com/about/,https://altonivelperuradio.com/wp-content/uploads/2020/05/LOGO-2-ALTO-NIVEL-PERU-RADIO-COM-1-180x100.jpg
 ALTRDTV.us,ALTRD.TV,,,,US,US-CA,Culver City,c/US,eng,entertainment,FALSE,,,,https://www.altrd.tv/,https://i.imgur.com/tINnhNm.png
+ALTTV.am,ALT TV,,,,AM,,Armavir,c/AM,hye,general,FALSE,,,,https://alttv.am/,https://i.imgur.com/x10KVOn.png
 ALTV.th,ALTV,Active Learning Television;Channel 4,,Thai Public Broadcasting Service,TH,,Bangkok,c/TH,tha,education,FALSE,2020-07-01,,,https://www.altv.tv/,https://i.imgur.com/MCbCSWv.png
 AltynAsyr.tm,Altyn Asyr,,,Maksat Altayev,TM,,Ashgabat,c/TM,tuk,general,FALSE,,,,http://turkmentv.gov.tm/,https://i.imgur.com/D7RBtZ2.png
 AlureChannel.th,A'lure Channel,,,MONO Group,TH,,Pak Kret,c/TH,tha,xxx,TRUE,2010-06-03,,,https://monomax.page.link/q5pY,https://i.imgur.com/yCvVorW.png
@@ -1284,6 +1306,7 @@ AmarinTV.th,Amarin TV,อมรินทร์ทีวี เอชดี ช
 AmariTV.rs,Amari TV,Амари ТВ,,AMARI TV d.o.o.,RS,,Belgrade,c/RS,srp,,FALSE,,,,http://www.amaritv.tv/,https://i.imgur.com/w5YScwl.png
 AmarUjala.in,AmarUjala,,,Rajul Maheshwari and Sneh Maheshwari,IN,,Noida,c/IN,hin,news,FALSE,,,,https://www.amarujala.com/,https://i.imgur.com/ndQ8LZp.png
 AmateurBoxxx.us,AmateurBoxxx,,,Reel Digital Inc,US,US-FL,Boca Raton,c/US,eng,xxx,TRUE,,,,https://tour.amateurboxxx.com/,https://i.imgur.com/FvbR2Zt.png
+AMAZETV.sl,AMAZE TV,,,,SL,,Freetown,c/SL,eng,general,FALSE,,,,https://atvbase.live/,https://i.imgur.com/0ojDf61.png
 AmazingDiscoveriesTV.ca,Amazing Discoveries TV,,,,CA,CA-BC,100 Mile House,c/CA,eng,religious,FALSE,,,,https://adtv.watch/,https://i.imgur.com/I0oPFTj.png
 AmazingFactsTV.us,Amazing Facts TV,,,Amazing Facts International,US,US-CA,Granite Bay,c/US,eng,religious,FALSE,,,,https://www.amazingfacts.org/,https://i.imgur.com/HhZZTNM.png
 AmazingPowerTV.gh,Amazing Power TV,,,,GH,,Kumasi,c/GH,eng,religious,FALSE,,,,,https://i.imgur.com/hW61ml0.png
@@ -1379,6 +1402,7 @@ AmritaTV.in,Amrita TV,,,Mata Amritanandamayi Math,IN,,Thiruvananthapuram,c/IN,ma
 AmurskoyeOblastnoyeTV.ru,Amurskoye Oblastnoye TV,Амурское областное телевидение,,,RU,,Amurskoye,c/RU,rus,general,FALSE,,,,https://amurobl.tv/,https://i.imgur.com/L55yGJu.png
 AmuseAnimation.fr,Amuse Animation,,,,FR,,Paris,c/FR,fra,animation,FALSE,,,,https://www.amuseanimation.com/,https://i.imgur.com/DbfG9QU.png
 AmuseAnimation.it,Amuse Animation,,,,IT,,Paris,c/IT,ita,animation,FALSE,,,,https://www.amuseanimation.com/,https://i.imgur.com/bHpSjEk.png
+AMusicChannel.ng,AMusic Channel,,,,NG,,,c/NG,eng,music,FALSE,,,,http://amusic.tv/,https://i.imgur.com/06zuf64.png
 AMXNoticias.mx,AMX Noticias,,,Sistema Mexiquesnse de Medios Publicos,MX,,Mexico City,c/MX,spa,news,FALSE,2020-04-01,,,https://radioytvmexiquense.mx/index.php/noticias/,https://i.imgur.com/snIU1UA.jpg
 AnaadiTV.in,Anaadi TV,,,Shri Ram Tiwari,IN,,Bhopal,c/IN,hin,news,FALSE,,,,https://www.anaaditv.com/,https://i.imgur.com/Ir26BK6.png
 AnadoluAgency.tr,Anadolu Agency,Anadolu Ajansı,,,TR,,Ankara,c/TR,tur,news,FALSE,,,,http://www.aa.com.tr/,https://i.imgur.com/dWElJll.png
@@ -1492,6 +1516,7 @@ Animaux.fr,Animaux,,,AB Sat,FR,,Saint-Denis,c/FR,fra,education,FALSE,1996-04-02,
 Animax.de,Animax,アニマックス,Animax,AK Media,DE,,Tokyo,c/DE,deu,animation,FALSE,2007-06-05,2016-07-07,,http://www.animaxtv.de/,https://upload.wikimedia.org/wikipedia/commons/6/65/Animaxlogo-20160701.png
 Animax.es,Animax,アニマックス,Animax,AK Media,ES,,Tokyo,c/ES,spa,animation,FALSE,2008-04-12,2013-12-31,,,https://upload.wikimedia.org/wikipedia/commons/thumb/d/dc/Animax3.png/512px-Animax3.png
 Animax.hk,Animax,アニマックス,Animax,AK Media,HK,,Tokyo,c/HK,zho,animation,FALSE,2004-01-12,,,http://www.animax-hk.com,https://upload.wikimedia.org/wikipedia/commons/6/65/Animaxlogo-20160701.png
+Animax.id,Animax,,,,ID,,,c/ID,jpn,animation;kids,FALSE,,,,https://www.animax-asia.com/,https://upload.wikimedia.org/wikipedia/commons/6/65/Animaxlogo-20160701.png
 Animax.in,Animax,アニマックス,Animax,Sony Pictures Entertainment,IN,,Tokyo,c/IN,jpn;eng,animation,FALSE,2004-07-04,2017-04-18,,,https://upload.wikimedia.org/wikipedia/commons/6/65/Animaxlogo-20160701.png
 Animax.jp,Animax,アニマックス,Animax,AK Media,JP,,Tokyo,c/JP,jpn,animation,FALSE,1998-05-20,,,https://www.animax.co.jp/,https://ri.zzls.xyz/bYX8NqT.png
 Animax.kr,Animax,アニマックス,Animax,JJMediaWorks,KR,,Seoul,c/KR,kor,animation,FALSE,2006-04-29,,,http://www.animaxtv.co.kr/,https://upload.wikimedia.org/wikipedia/commons/6/65/Animaxlogo-20160701.png
@@ -1514,6 +1539,10 @@ AniplusAsia.sg,Aniplus Asia,,Aniplus,Plus Media Networks Asia,SG,,Singapore,r/SE
 AnixeHDSerie.de,Anixe HD Serie,,,Anixe HD Television GmbH ,DE,,Munich,c/DE,deu,entertainment,FALSE,,,,http://www.anixehd.tv/index.php?hdsd=HD,https://upload.wikimedia.org/wikipedia/commons/thumb/c/c0/Anixe_HD.svg/512px-Anixe_HD.svg.png
 AnixePlus.de,Anixe +,,,Anixe HD Television GmbH ,DE,,Munich,c/DE,deu,entertainment,FALSE,,,,http://www.anixehd.tv/index.php?hdsd=SD,https://i.imgur.com/hvGJ2oa.png
 AnjanTV.in,Anjan TV,,,,IN,,New Delhi,c/IN,hin,entertainment,FALSE,,,,https://www.anjan.tv/,https://i.imgur.com/sh0yFSf.png
+<<<<<<< HEAD
+=======
+AnkyunPlus3TV.am,Ankyun+3 TV,,,,AM,,Alaverdi,c/AM,hye,general,FALSE,,,,https://ankyun3news.com/,https://i.imgur.com/UNkjhtg.jpg
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 ANN.sy,ANN,,,Siwar al Assad,SY,,London,c/SY,ara,news,FALSE,1997-01-01,,,https://anntv.co.uk/,https://www.freeetv.com/images/01_logo/arab_news_network.jpg
 AnNinhTheGioi.vn,An Ninh The Gioi,An Ninh Thế Giới,,HCATV,VN,,,c/VN,vie,,FALSE,2009-10-28,,,https://antg.cand.com.vn/,https://i.imgur.com/H1JjQWs.png
 AnNinhTV.vn,An Ninh TV,ANTV,,Ministry of Public Security of Vietnam,VN,,,c/VN,vie,,FALSE,2011-12-01,,,https://www.antv.gov.vn/,https://i.postimg.cc/ht0CqCBy/ANTV-logo-2016.png
@@ -1540,8 +1569,10 @@ Antena3CNNHD.ro,Antena 3 CNN HD,,Antena Group,Intact Media Group,RO,,Bucharest,c
 Antena3Internacional.es,Antena 3 Internacional,,,Atresmedia Corporación de Medios de Comunicación SA,ES,,San Sebastian de los Reyes,r/HISPAM,spa,general,FALSE,1995-01-01,,,https://www.antena3internacional.com/,https://i.imgur.com/QMadWXp.png
 Antena7.do,Antena 7,,,Albavision,DO,,Santo Domingo,c/DO,spa,general,FALSE,1999-10-16,,,https://www.antena7.com.do/,https://i.imgur.com/zKWFgeQ.png
 Antena91.ar,Antena 91,,,,AR,,Buenos Aires,c/AR,spa,,FALSE,,,,http://www.antena91.com.ar/Reproductor.htm,https://i.imgur.com/HAJxHcV.png
+AntenaHD.pl,Antena HD,,,,PL,,,c/PL,pol,entertainment,FALSE,2021-05-01,,,,https://i.imgur.com/obwYQZC.png
 AntenaInternational.ro,Antena International,,Antena Group,Intact Media Group,RO,,Bucharest,c/RO,ron,general,FALSE,2006-07-01,,,http://antenainternational.ro/,https://i.imgur.com/ZEJ7BW3.png
 AntenaInternationalHD.ro,Antena International HD,,Antena Group,Intact Media Group,RO,,Bucharest,c/RO,ron,general,FALSE,,,,http://antenainternational.ro/,https://i.imgur.com/ZEJ7BW3.png
+AntenaLinceUAdeO.mx,Antena Lince UAdeO,,,Universidad Autónoma de Occidente,MX,MX-SIN,Los Mochis,c/MX,spa,education,FALSE,,,,https://uadeo.mx/antena-lince-uadeo/,https://i.imgur.com/eQjMUiE.jpeg
 AntenaMonden.ro,Antena Monden,,Antena Group,Intact Media Group,RO,,Bucharest,c/RO,ron,lifestyle,FALSE,,,,https://antenaplay.ro/,https://i.imgur.com/iMoHkdO.png
 AntenaSeisTV.cr,Antena Seis TV,,,,CR,,San Jose,c/CR,spa,general,FALSE,,,,http://www.antenaseis.com/,https://i.imgur.com/9Nh2mo9.png
 AntenaSport.ro,AntenaSport,,Antena Group,Antena TV Group S.A,RO,,Bucharest,c/RO,ron,sports,FALSE,,,,https://as.ro/,https://i.imgur.com/PThJPu2.png
@@ -1569,6 +1600,7 @@ ANTV.id,ANTV,,,Intermedia Capital,ID,,South Jakarta,c/ID,ind,general,FALSE,1993-
 ANTV.pa,ANTV,,,,PA,,Panama City,c/PA,spa,legislative,FALSE,,,,https://www.asamblea.gob.pa/,https://i.imgur.com/UAqcj4Z.png
 ANTV.ve,ANTV,,,National Assembly of Venezuela,VE,,Caracas,c/VE,spa,legislative,FALSE,2016-01-15,,,http://www.asambleanacional.gob.ve/,https://i.imgur.com/Qm88HT0.png
 AnVienTV.vn,An Vien TV,An Viên Television,,Audio Visual Global JSC,VN,,Hanoi,c/VN,vie,entertainment,FALSE,2011-11-11,,,https://www.avg.vn/,https://i.imgur.com/er3l0Pq.png
+AnwarTV.ml,Anwar TV,,,,ML,,Bamako,c/ML,fra,religious,FALSE,,,,,https://i.imgur.com/yiW1vUB.jpg
 AnwarTV2.iq,Anwar TV2,Al Anwar TV2;قناة الثانية الفضائية;قناة الانوار 2,,,IQ,,Baghdad,c/IQ,ara,news,FALSE,,,,https://anwartv2.com/,https://i.imgur.com/yHZXPcn.png
 AnzoateguiTV.ve,Anzoategui TV,Anzoátegui TV,,,VE,VE-B,Barcelona,c/VE,spa,general,FALSE,,,,https://anzoategui.tv/,https://i.imgur.com/SLqrEOz.png
 AOC1.us,AOC 1,,,,US,US-LA,Lafayette,s/US-LA,eng,legislative,FALSE,,,,http://www.aocinc.org/watch,https://i.imgur.com/81mX94G.png
@@ -1583,20 +1615,27 @@ APACChannel9.us,APAC Channel 9,,,,US,US-MA,Ayer,s/US-MA,eng,general,FALSE,,,,htt
 APACChannel99.us,APAC Channel 99,,,,US,US-MA,Ayer,s/US-MA,eng,education,FALSE,,,,https://www.ayerpublicaccess.org/ch-99-education-live.html,https://i.imgur.com/KGQg0ye.png
 ApacibolTV.co,Apacibol TV,,,,CO,,Ciudad Bolívar,c/CO,spa,general,FALSE,,,,https://apacibol.com/,https://i.imgur.com/UxneepB.png
 APara.tr,A Para,,,,TR,,Istanbul,c/TR,tur,news,FALSE,,,,http://www.apara.com.tr/,https://i.imgur.com/GjHnq0c.png
+apartTV.lu,apart TV,,,,LU,,Bettange-sur-Mess,c/LU,ltz,lifestyle;business;culture,FALSE,2015-01-15,,,https://www.apart-tv.lu/,https://i.imgur.com/IBcMIcZ.png
 APATv.az,APA Tv,,,,AZ,,Baku,c/AZ,aze,news,FALSE,,,,https://apa.tv/,https://i.imgur.com/2CSW4V4.png
 ApintieTelevisie.sr,Apintie Televisie,Channel 10,,Apintie N.V,SR,,Paramaribo,c/SR,nld;srn,news,FALSE,1958-08-02,,,https://www.apintie.sr/,https://i.imgur.com/PzfSiim.png
 APlus.fr,A+,,,Canal+ Overseas,FR,,Boulogne,c/FR,fra,culture,FALSE,2014-10-24,,,https://www.a-plus.com/,https://i.imgur.com/tkUjnWD.png
 APlus.mx,A+,A Más,Televisión Azteca,,MX,,Mexico City,c/MX,spa,culture,FALSE,2017-03-20,,,https://www.tvazteca.com/amastv,https://i.imgur.com/TWk9gfd.png
+APlusBenin.bj,A+ Benin,A+ Bénin,,,BJ,,,c/BJ,fra,entertainment,FALSE,,,,https://www.canalplus-afrique.com/bj/offres-tv/aplus-benin,https://i.imgur.com/j3jl3rd.jpg
 APlusGuate.gt,A+ Guate,A Más Guate,Televisión Azteca,Grupo Salinas ; TV Azteca (Televisión Azteca),GT,,Guatemala City,c/GT,spa,general,FALSE,,,,https://tvaztecaguate.com/,https://i.imgur.com/BtGK7iZ.png
 APlusInternational.fr,A+ International,,,Canal+ Overseas,FR,,Boulogne,c/FR,fra,culture,FALSE,2014-10-24,,,https://www.a-plus.com/,https://i.imgur.com/tkUjnWD.png
 APlusIvoire.ci,A+ Ivoire,,,Canal+ Overseas,CI,,Abidjan,c/CI,fra,culture,FALSE,,,,https://www.a-plus.com/,https://i.imgur.com/yOW0vyP.png
 APlusKidsTV.lk,A Plus Kids TV,,,,LK,,Colombo,c/LK,eng,kids,FALSE,,,,,https://i.imgur.com/fyIWnlJ.png
 APlusKidsTV.uk,A+ Kids TV,,,,UK,,London,c/UK,eng,kids,FALSE,,,,https://apluskidstv.com/,https://i.imgur.com/ZUVvwC0.png
+APlusTV.me,A Plus TV,,,,ME,,Podgorica,c/ME,cnr,general,FALSE,,,,https://aplusme.me/,https://i.imgur.com/J7wWp9Y.jpg
 APlusTV.pk,A-Plus TV,,,Sports Star International,PK,,Lahore,c/PK,urd,entertainment,FALSE,2009-07-24,,,http://www.a-plus.tv/,https://i.imgur.com/uu0UJme.png
 APlusV.uy,A+V,,,,UY,,Montevideo,c/UY,spa,culture,FALSE,,,,http://www.amasv.com.uy/,https://i.imgur.com/tmEXjlY.png
 APN.in,APN,,,,IN,,Delhi,c/IN,hin,news,FALSE,,,,https://www.apnlive.com/,https://i.imgur.com/RhkbhZD.png
 ApnaChannel.pk,Apna Channel,اپنا چینل,,Ahmed Hussain,PK,,Karachi,c/PK,urd;eng,general,FALSE,2004-10-14,,,http://apna.tv/,https://i.imgur.com/ICSA4W6.png
 ApnaPunjabTV.ca,Apna Punjab TV,,,,CA,CA-ON,Brampton,c/IN,hin,entertainment,FALSE,,,,https://www.apnapunjab.tv/,https://i.imgur.com/IM4D8Wz.png
+<<<<<<< HEAD
+=======
+ApnaTV.nz,Apna TV,,,,NZ,,Auckland,c/NZ,eng;hin,culture,FALSE,,,,https://apnanetwork.co.nz/,https://i.imgur.com/35Fwz9F.png
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 ApolloMediaCenter.us,Apollo Media Center,,,,US,US-NY,Buffalo,s/US-NY,eng,general,FALSE,,,,https://apollomediacenter.com/live-stream,https://i.imgur.com/8uXm45w.png
 ApostolicOnenessNetwork.us,Apostolic Oneness Network,,,,US,US-IA,Des Moines,c/US,eng,religious,FALSE,,,,https://aon.lightcast.com/,https://i.imgur.com/6BnF2vH.png
 ApostolTV.hu,Apostol TV,,,,HU,,Budapest,c/HU,hun,religious,FALSE,,,,http://apostoltv.hu/,https://i.imgur.com/C43Cc9N.png
@@ -1854,6 +1893,10 @@ AsiesmiGenteTV.us,Asi es mi Gente TV,Así es mi Gente TV,,,US,US-DC,Washington,c
 AsilTV.ir,Asil TV,,,,IR,,,c/IR,ara,,FALSE,,,,http://webtv.islamasil.net/,https://i.imgur.com/gROQqFD.png
 AsiriTV.pe,AsiriTV,,,,PE,PE-LIM,Lima,c/PE,spa,culture,FALSE,,,,https://asiritv.pe/,https://i.imgur.com/7bGVFBa.png
 AsiSucedeGuanajuato.mx,Asi Sucede Guanajuato,Así Sucede Guanajuato;Canal 71 Celaya,,,MX,MX-GUA,Celaya,c/MX,spa,general,FALSE,,,,https://asisucedegto.mx/,https://i.imgur.com/6W7HUtG.png
+<<<<<<< HEAD
+=======
+AsluTV.mv,Aslu TV,,,,MV,,,c/MV,div,general,FALSE,,,,https://aslu.com.mv/,https://i.imgur.com/RTv6klV.jpeg
+>>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 Asomavision.ec,Asomavision,Asomavisión,,,EC,,Quito,c/EC,spa,,FALSE,,,,https://www.asomavision.com/,https://i.imgur.com/a5avk5R.png
 AsomdweeRadioTV.us,Asomdwee Radio & TV,,,Asomdwee Media Group,US,US-MD,Rockville,c/US;c/GH,eng,religious,FALSE,,,,https://www.ghanaweb.com/radio/new-radio.php?ID=304,https://i.imgur.com/oIVyl1t.jpg
 ASondeSalsa.pa,A Son de Salsa,,,,PA,,Panama City,r/HISPAM,spa,music,FALSE,,,,https://asondesalsa.com.pa/tv-online/,https://i.imgur.com/Nv8SAJq.png
@@ -1878,7 +1921,7 @@ AstrahanRuSport.ru,Astrahan.Ru Sport,,,,RU,,Astrakhan,c/RU,rus,sports,FALSE,,,,h
 AstrahanRuTV.ru,Astrahan.Ru TV,,,,RU,,Astrakhan,c/RU,rus,,FALSE,,,,https://live.astrakhan.ru/,https://i.imgur.com/w4ys6zm.png
 AstraMarket.uk,AstraMarket,,,,UK,,,r/EUR,eng,shop,FALSE,,,,https://astramarket.eu/live.html,https://i.ibb.co/3Mrrkh3/astralogo.png
 AstraTV.gr,AstraTV,,,,GR,,Larissa,c/GR,ell,news,FALSE,,,,https://www.astratv.gr/live-streaming/,https://i.imgur.com/oYRPfZm.png
-AstroAEC.my,Astro AEC,,,Astro,MY,,Kuala Lumpur,c/MY,zho,general,FALSE,1997-09-01,,,http://www.astro.com.my/channels/,https://i.imgur.com/pl3J4yN.png
+AstroAEC.my,Astro AEC,,,Astro,MY,,Kuala Lumpur,c/MY,zho,general,FALSE,1997-09-01,,,http://www.astro.com.my/channels/,https://i.postimg.cc/wTQ0nC4r/Astro-AEC.png
 AstroAOD.my,Astro AOD,,,Astro,MY,,Kuala Lumpur,c/MY,yue;zho,,FALSE,2007-07-16,,,https://www.watchod.com/,https://upload.wikimedia.org/wikipedia/en/c/cb/Astro_AOD.jpeg
 AstroAOD311.my,Astro AOD 311,,,Astro,MY,,Kuala Lumpur,c/MY,msa,,FALSE,2007-07-16,,,,https://i.imgur.com/o0WIkqh.png
 AstroAOD352.my,Astro AOD 352,,,Astro,MY,,Kuala Lumpur,c/MY,yue;zho,,FALSE,2007-07-16,2020-04-01,,https://www.watchod.com/,https://i.imgur.com/e65YCgk.png
@@ -1895,7 +1938,7 @@ AstroBoxOfficeMoviesThangathirai.my,Astro Box Office Movies Thangathirai,,,Astro
 AstroBoxOfficeTayanganHebat.my,Astro Box Office Tayangan Hebat,,,Astro,MY,,Kuala Lumpur,c/MY,msa,movies,FALSE,2000-01-01,2021-06-01,,http://www.astro.com.my/,https://i.imgur.com/6ELP9dE.png
 AstroBoxOfficeThangathirai.my,Astro Box Office Thangathirai,,,Astro,MY,,Kuala Lumpur,c/MY,msa,movies,FALSE,2000-01-01,,,http://www.astro.com.my/,https://i.imgur.com/7J98X4F.png
 AstrocenterTV.fr,Astrocenter TV,,,Astro,FR,,Paris,c/FR,fra,entertainment,FALSE,,,,https://mon.astrocenter.fr/tv/en-direct,https://i.imgur.com/3xlJV7O.png
-AstroCeria.my,Astro Ceria,,,Astro,MY,,Kuala Lumpur,c/MY,msa,kids,FALSE,2006-05-02,,,http://www.astro.com.my/ceria/,https://i.imgur.com/pjqtJKW.png
+AstroCeria.my,Astro Ceria,,,Astro,MY,,Kuala Lumpur,c/MY,msa,kids,FALSE,2006-05-02,,,http://www.astro.com.my/ceria/,https://i.postimg.cc/Y9DdDYXC/300px-Astro-Ceria.png
 AstroCh100.my,Astro Ch 100,,,Astro,MY,,Kuala Lumpur,c/MY,msa,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/en/thumb/0/09/Astro_TV_logo.svg/800px-Astro_TV_logo.svg.png
 AstroCitra.my,Astro Citra,,,Astro,MY,,Kuala Lumpur,c/MY,msa,movies,FALSE,2009-06-01,,,http://www.astro.com.my/epg/channel.php?id=413046,https://i.imgur.com/oBfVSEA.png
 AstroCricket.my,Astro Cricket,,,Astro,MY,,Kuala Lumpur,c/MY,eng,sports,FALSE,2015-08-31,,,http://www.astro.com.my/,https://i.imgur.com/miyMp5p.png
@@ -1913,6 +1956,7 @@ AstroSuperSport2.my,Astro SuperSport 2,,,Astro,MY,,Kuala Lumpur,c/MY,eng,sports,
 AstroSuperSport3.my,Astro SuperSport 3,,,Astro,MY,,Kuala Lumpur,c/MY,eng,sports,FALSE,2010-08-12,,,https://www.astro.com.my/,https://i.imgur.com/TE652vN.png
 AstroSuperSport4.my,Astro SuperSport 4,,,Astro,MY,,Kuala Lumpur,c/MY,eng,sports,FALSE,2013-04-23,,,https://www.astro.com.my/,https://i.imgur.com/irWZ3TG.png
 AstroSuperSport5.my,Astro SuperSport 5,,,Astro,MY,,Kuala Lumpur,c/MY,eng,sports,FALSE,2021-10-01,2023-07-15,,https://www.astro.com.my/,https://i.imgur.com/ebpvrUx.png
+AstroTelevision.zm,Astro Television,,,Astrorix Television Limited,ZM,,Lusaka,c/ZM,eng,general,FALSE,,,,https://astrorixgroup.co.zm/astro-television/,https://i.imgur.com/y6F2T1e.jpg
 AstroTutorTVPT3.my,Astro Tutor TV PT3,,,Astro,MY,,Kuala Lumpur,c/MY,msa,education,FALSE,2012-02-18,,,https://content.astro.com.my/channels/Astro-Tutor-TV-PT3-127,https://i.imgur.com/V54kKEf.png
 AstroTutorTVSPM.my,Astro Tutor TV SPM,,,Astro,MY,,Kuala Lumpur,c/MY,msa,education,FALSE,2012-02-18,,,https://content.astro.com.my/channels/Astro-Tutor-TV-SPM-128,https://i.imgur.com/aAZMOcj.png
 AstroTutorTVUPSR.my,Astro Tutor TV UPSR,,,Astro,MY,,Kuala Lumpur,c/MY,msa,education,FALSE,2012-02-18,,,https://content.astro.com.my/channels/Astro-Tutor-TV-SPM-128,https://i.imgur.com/fPSZKml.png