diff --git a/.gitignore b/.gitignore
index 20f3383..3258b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .venv/
-<<<<<<< Updated upstream
 __pycache__/
-=======
 .direnv
 .envrc
 .python-version
->>>>>>> Stashed changes