diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 84db35a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-*/__pycache__/
-=======
-*/__pycache__/
->>>>>>> 17924159a14cb91a13961fefe6b58e69eb06988b