diff --git a/.gitignore b/.gitignore
index 0df714e..77f8900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 outputs/
+logs/
 
-=======
->>>>>>> 54e072e61c24a3ce12a7f47e17e9d8d0d1583236
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -117,10 +115,7 @@
 .venv
 env/
 venv/
-<<<<<<< HEAD
 venv-*
-=======
->>>>>>> 54e072e61c24a3ce12a7f47e17e9d8d0d1583236
 ENV/
 env.bak/
 venv.bak/