Fixed conflicts

2 files changed, 14 insertions, 14 deletions

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index e7756f8e..642a6639 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -1,11 +1,11 @@
 {
   "cloudflare": [
     "https://invidious.kavin.rocks",
-    "https://piped.kavin.rocks",
     "https://piped.tokhmi.xyz",
     "https://piped.moomoo.me",
+    "https://piped.syncpundit.com",
     "https://piped.mha.fi",
-    "https://de-piped.shimul.me",
+    "https://jp-piped.shimul.me",
     "https://pipedus.palash.dev",
     "https://piped.waffle.wiki",
     "https://watch.whatever.social",
@@ -59,8 +59,8 @@
     "https://invidious.snopyta.org",
     "https://tok.habedieeh.re",
     "https://n.hyperborea.cloud",
-    "https://nitter.spaceint.fr",
     "https://bibliogram.snopyta.org",
+    "https://insta.trom.tf",
     "https://libreddit.autarkic.org",
     "https://libreddit.notyourcomputer.net",
     "https://anon.sx",
@@ -73,7 +73,6 @@
     "https://searx.ericaftereric.top",
     "https://searx.fmac.xyz",
     "https://searxng.au/searx",
-    "https://www.webrats.xyz",
     "https://search.albony.xyz",
     "https://whoogle.esmailelbob.xyz",
     "https://beatbump.ml",
diff --git a/src/instances/data.json b/src/instances/data.json
index 3e82842c..0565348b 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -7,7 +7,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",
@@ -21,6 +20,7 @@
       "https://invidious.weblibre.org",
       "https://invidious.snopyta.org",
       "https://invidious.esmailelbob.xyz",
+      "https://yt.artemislena.eu",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -39,12 +39,12 @@
   },
   "piped": {
     "normal": [
-      "https://piped.kavin.rocks",
       "https://piped.tokhmi.xyz",
       "https://piped.moomoo.me",
       "https://il.ax",
+      "https://piped.syncpundit.com",
       "https://piped.mha.fi",
-      "https://de-piped.shimul.me",
+      "https://jp-piped.shimul.me",
       "https://pipedus.palash.dev",
       "https://piped.waffle.wiki",
       "https://watch.whatever.social",
@@ -477,6 +477,8 @@
       "https://anon.sx",
       "https://dynabyte.ca",
       "https://jsearch.pw",
+      "https://northboot.xyz",
+      "https://search.affusio.com",
       "https://search.ethibox.fr",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
@@ -515,6 +517,8 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -532,7 +536,6 @@
       "https://de.xcxc.ml",
       "https://etsi.me",
       "https://jackgoss.xyz",
-      "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
@@ -541,7 +544,6 @@
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
-      "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
@@ -587,6 +589,7 @@
       "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://sh0.it",
+      "https://soek.allesbeste.com",
       "https://srx.cosmohub.io",
       "https://swag.pw",
       "https://www.gruble.de",
@@ -596,10 +599,8 @@
     ],
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
-      "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
       "http://b6sxmon57qza6dt36li7huabie5ntrvjr4q5rc2vvbn4hqvzd4phrvyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
-      "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
       "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
@@ -699,7 +700,8 @@
   },
   "beatbump": {
     "normal": [
-      "https://beatbump.ml"
+      "https://beatbump.ml",
+      "https://beatbump.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -733,6 +735,7 @@
     "loki": []
   },
   "peertube": [
+    "https://kinotu.be",
     "https://tube.nogafa.org",
     "https://www.neptube.io",
     "https://tube.ghk-academy.info",
@@ -947,7 +950,6 @@
     "https://pt.nospy.net",
     "https://yhwh.tube",
     "https://peerlook.ru",
-    "https://monero.wf",
     "https://tube.kicou.info",
     "https://video.aqr.af",
     "https://videos-passages.huma-num.fr",
@@ -1049,7 +1051,6 @@
     "https://ua.peertube.red",
     "https://peertube.zwindler.fr",
     "https://videos.fsci.in",
-    "https://swebbtube.se",
     "https://video.dnfi.no",
     "https://peertube.revelin.fr",
     "https://armstube.com",