diff --git a/.gitignore b/.gitignore
index 602ef95..72e20fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 3246653 (my entire obs vault)
-.obsidian/cache
-.trash/
-.DS_Store
+.obsidian/cache .tash/ .DS_Store