diff --git a/blacklist b/blacklist
index 67552bf..5d4657a 100644
--- a/blacklist
+++ b/blacklist
@@ -106,9 +106,6 @@ ff02::3 ip6-allhosts
 0.0.0.0 wmyenypqxnplf.website
 0.0.0.0 hotjar-analytics.com
 0.0.0.0 business.samsungusa.com
-<<<<<<< HEAD
-0.0.0.0 adblock.turtlecute.org##.adbox.banner_ads.adsbox
-0.0.0.0 d3ward.github.io##.textads
 0.0.0.0 argylesecurity.com
 0.0.0.0 img1.bestxboobs.com
 0.0.0.0 www.hypnovideo.com
@@ -201,7 +198,5 @@ ff02::3 ip6-allhosts
 0.0.0.0 endfield.gryphline.com
 0.0.0.0 l.locopar.com
 0.0.0.0 oncehuman.game
-=======
 0.0.0.0 adblock.turtlecute.org
 0.0.0.0 d3ward.github.io
->>>>>>> 21a89ce (test)