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