diff --git a/data/channels.csv b/data/channels.csv
index 7c6659fe..bab0745a 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -3084,10 +3084,6 @@ BigBrotherIsrael.il,Big Brother Israel,,,,IL,,,c/IL,heb,series,FALSE,,,,http://w
 BigBrotherMzansi.za,Big Brother Mzansi,,,,ZA,,,c/ZA,eng,series,FALSE,,,,,https://i.imgur.com/7OD7YhQ.png
 BIGCivicChannel.us,BIG Civic Channel,Brookline Interactive Group Civic Channel,,,US,US-MA,Brookline,s/US-MA,eng,general,FALSE,,,,http://brookline-interactive-group.cablecast.tv:8080/CablecastPublicSite/watch/2?channel=2,https://i.imgur.com/6HDMVBB.png
 BIGCommunityChannel.us,BIG Community Channel,Brookline Interactive Group Community Channel,,,US,US-MA,Brookline,s/US-MA,eng,general,FALSE,,,,https://brooklineinteractive.org/live/,https://i.imgur.com/6HDMVBB.png
-<<<<<<< Updated upstream
-=======
-<<<<<<< HEAD
->>>>>>> Stashed changes
 BigGanga.in,Big Ganga,,,Zee Entertainment Enterprises,IN,,New Delhi,c/IN,bho,entertainment,FALSE,2016-01-14,,,,https://i.imgur.com/GLIdQyF.png
 BigGangaTalkies.in,Big Ganga Talkies,,,,IN,,,c/IN,bho,,FALSE,,,,,https://i.imgur.com/PjcRymD.png
 Biggs.pt,Biggs,,,NOS SGPS S.A.;AMC Networks Inc.,PT,,Lisbon,c/PT,por,kids,FALSE,2009-12-01,,,http://biggs.pt/,https://upload.wikimedia.org/wikipedia/en/thumb/6/6f/Panda_Biggs_logo.png/512px-Panda_Biggs_logo.png
@@ -3811,7 +3807,6 @@ Canal161.mx,Canal 16.1,,,SET Puebla,MX,MX-PUE,Puebla,s/MX-PUE,spa,general,FALSE,
 Canal162.mx,Canal 16.2,,,SET Puebla,MX,MX-PUE,Puebla,s/MX-PUE,spa,general,FALSE,,,,https://www.setpuebla.mx/,https://i.imgur.com/050hrND.png
 Canal16PacificoTV.ar,Canal 16 Pacifico TV,,,,AR,AR-A,Salta,s/AR-A,spa,general,FALSE,,,,http://pacifico929.com.ar/,https://i.imgur.com/nn6Kl0r.png
 Canal17TVNosara.cr,Canal 17 TV Nosara,,,,CR,,Nosara,c/CR,spa,general,FALSE,,,,https://www.radioytvnosara.online/,https://i.imgur.com/pqMTMgF.jpg
-<<<<<<< Updated upstream
 Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,Torre Pacheco,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png
 Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,Torre Pacheco,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png
 Canal180.pt,Canal180,,,OSTV,PT,,Porto,c/PT,por,culture,FALSE,2011-04-25,,,https://www.canal180.pt/,https://i.imgur.com/2JgwPmm.jpeg