diff --git a/.gitignore b/.gitignore
index b850de3..7a14487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,13 +3,6 @@ __pycache__
 .venv
 .aider*
 .vscode
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zed
 pyproject.toml
 .ropeproject
-=======
->>>>>>> e1a24af (get rid of think tags)
-=======
-generated_files/*
->>>>>>> d45f0be (env set up for remote)