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