diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 4377c01..df438be 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -8,11 +8,8 @@
     "https://piped.mha.fi",
     "https://piped.shimul.me",
     "https://pipedus.palash.dev",
-<<<<<<< HEAD
-=======
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
@@ -23,10 +20,7 @@
     "https://twitter.dr460nf1r3.org",
     "https://nitter.garudalinux.org",
     "https://nitter.wef.lol",
-<<<<<<< HEAD
     "https://nitter.catalyst.sx",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://nitter.fprivacy.com",
     "https://bib.actionsack.com",
     "https://libreddit.domain.glass",
diff --git a/src/instances/data.json b/src/instances/data.json
index c754bad..0567849 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -8,7 +8,6 @@
       "https://inv.riverside.rocks",
       "https://invidious.osi.kr",
       "https://y.com.sb",
-      "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
       "https://invidious.tiekoetter.com",
@@ -20,7 +19,8 @@
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.weblibre.org",
-      "https://invidious.namazso.eu"
+      "https://invidious.namazso.eu",
+      "https://yt.artemislena.eu"
     ],
     "tor": [
       "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
@@ -46,16 +46,13 @@
       "https://piped.mha.fi",
       "https://piped.shimul.me",
       "https://pipedus.palash.dev",
-<<<<<<< HEAD
-=======
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
       "https://piped.esmailelbob.xyz",
-      "https://piped.projectsegfau.lt/"
+      "https://piped.projectsegfau.lt"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -173,7 +170,6 @@
       "https://nitter.projectsegfau.lt",
       "https://singapore.unofficialbird.com",
       "https://twt.funami.tech",
-<<<<<<< HEAD
       "https://nitter.fprivacy.com",
       "https://canada.unofficialbird.com",
       "https://india.unofficialbird.com",
@@ -181,9 +177,6 @@
       "https://uk.unofficialbird.com",
       "https://n.l5.ca",
       "https://nitter.slipfox.xyz"
-=======
-      "https://nitter.fprivacy.com"
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     ],
     "tor": [
       "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@@ -463,24 +456,11 @@
     "loki": []
   },
   "searx": {
-<<<<<<< HEAD
-=======
-    "tor": [
-      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
-      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
-    ],
-    "i2p": [
-      "http://ransack.i2p",
-      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
-    ],
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "normal": [
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
+      "https://private-searx.ml",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -506,7 +486,6 @@
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.vanwa.tech",
-      "https://searx.vimproved.me",
       "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
@@ -520,27 +499,14 @@
       "https://searx.roflcopter.fr"
     ],
     "tor": [
-<<<<<<< HEAD
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
+      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion"
-=======
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
-      "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion"
     ],
     "i2p": [
       "http://ransack.i2p",
@@ -559,7 +525,6 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
-      "https://private-searx.ml",
       "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
@@ -580,10 +545,7 @@
       "https://search.sapti.me",
       "https://search.teamriverbubbles.com",
       "https://search.unlocked.link",
-<<<<<<< HEAD
       "https://search.vidhukant.xyz",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
       "https://search.zzls.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
@@ -606,6 +568,7 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
+      "https://searx.vimproved.me",
       "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.au/searx",
@@ -619,15 +582,13 @@
       "https://xcxc.ml"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
-      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
-      "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
       "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx",
       "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion"
@@ -689,7 +650,6 @@
       "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
       "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
       "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion"
-<<<<<<< HEAD
     ],
     "i2p": [],
     "loki": []
@@ -702,8 +662,6 @@
       "https://lbry.mutahar.rocks",
       "https://librarian.esmailelbob.xyz",
       "https://lbry.vern.cc"
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     ],
     "tor": [
       "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
@@ -713,7 +671,6 @@
     "loki": []
   },
   "peertube": [
-<<<<<<< HEAD
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
@@ -809,8 +766,6 @@
     "https://peertube.otakufarms.com",
     "https://tube.motuhake.xyz",
     "https://pt.m0r016.net",
-=======
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://hitchtube.fr",
     "https://video.fox-romka.ru",
     "https://peertube.ctrl-c.liu.se",
@@ -981,10 +936,6 @@
     "https://tube.globalfrens.com",
     "https://peertube.hacknews.pmdcollab.org",
     "https://freetubes.nohost.me",
-<<<<<<< HEAD
-=======
-    "https://video.simplex-software.ru",
->>>>>>> 468f9ff12cb88cf67ce14aa533f8c1c709923ff7
     "https://video.snug.moe",
     "https://video.avant-le-strike.buzz",
     "https://videos.ritimo.org",