diff --git a/.gitignore b/.gitignore
index dce0c1f..e5fcef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,5 @@
 config.toml
 .vs
 .vscode
-<<<<<<< HEAD
 .idea
-=======
 __pycache__
->>>>>>> 51011ec401ee07fe7446b24fad680a629e12ff56