diff --git a/.gitignore b/.gitignore
index 628b6f2..aaa7024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,12 @@ __pycache__
 .aider*
 .vscode
 <<<<<<< HEAD
+<<<<<<< HEAD
 .zed
 pyproject.toml
 .ropeproject
 =======
 generated_files/*
 >>>>>>> d45f0be (env set up for remote)
+=======
+>>>>>>> f24bd5b (cleanup directory)
diff --git a/generated_files/.gitignore b/generated_files/.gitignore
new file mode 100644
index 0000000..e69de29