diff --git a/.gitignore b/.gitignore
index 1d77f02..41397f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 outputs/
 
+=======
+>>>>>>> 54e072e61c24a3ce12a7f47e17e9d8d0d1583236
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -93,9 +96,12 @@
 #   install all needed dependencies.
 #Pipfile.lock
 
+<<<<<<< HEAD
 # Large Files
 *.tar.gz
 
+=======
+>>>>>>> 54e072e61c24a3ce12a7f47e17e9d8d0d1583236
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow
 __pypackages__/
 __pycache__/
@@ -112,7 +118,10 @@
 .venv
 env/
 venv/
+<<<<<<< HEAD
 venv-*
+=======
+>>>>>>> 54e072e61c24a3ce12a7f47e17e9d8d0d1583236
 ENV/
 env.bak/
 venv.bak/