diff --git a/.gitignore b/.gitignore
index fc9ffa9..42357d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,6 @@ settings.local.json
 
 # Apple idiocy
 .DS_Store
-<<<<<<< HEAD
-=======
 
 # Documentation
 docusaurus/
@@ -35,4 +33,3 @@ vitepress/
 
 # Local data
 offline/
->>>>>>> b275742 (Updated gitignore)