diff --git a/.frontmatter/database/taxonomyDb.json b/.frontmatter/database/taxonomyDb.json
index be11a1cd..8b137891 100644
--- a/.frontmatter/database/taxonomyDb.json
+++ b/.frontmatter/database/taxonomyDb.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"taxonomy":{"tags":["adguard","cmd","debian","firewall","fritzbox","it-security","linux","network","netzwerk","pi-hole","pihole","powershell","privacy","proxmox","raspberry pi","security","tutorials","video","windows","‘Video’","‘linux’","‘network’","‘tutorials’","“Security”","“Tutorials”","“adguard”","“cmd”","“firewall”","“fritzbox”","“it-security”","“linux”","“network”","“pi-hole”","“powershell”","“proxmox”","“raspberry pi”","“security”","“tutorials”","“video”","“windows”"],"categories":["Hardware","Linux","Network","Netzwerk","Privacy","Security","Tutorials","Video","Windows","linux","network","netzwerk","security","tutorials","video","‘Network’","‘Security’","‘Tutorials’","‘Video’","‘security’","“Hardware”","“Linux”","“Network”","“Security”","“Tutorials”","“Tutorials” - “Video”","“Video”","“Windows”","“linux”","“network”","“security”","“tutorials”","“video”"]}}
-=======
-{}
->>>>>>> 14a2e546 (Mistake)
+