diff --git a/.gitignore b/.gitignore
index 7a14487..105a0e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ __pycache__
 .venv
 .aider*
 .vscode
+<<<<<<< HEAD
 .zed
 pyproject.toml
 .ropeproject
+=======
+>>>>>>> e1a24af (get rid of think tags)