diff --git a/.gitignore b/.gitignore
index 84db35a..c01bd8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
 */__pycache__/
-=======
-*/__pycache__/
->>>>>>> 17924159a14cb91a13961fefe6b58e69eb06988b