diff --git a/.gitignore b/.gitignore
index a67e0b2..b3aa1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 /__pycache__
 /venv
 /configs/squash
+=======
+/venv
+/__pycache__
+>>>>>>> 7ca4d57 (-)