diff --git a/.gitignore b/.gitignore
index f3627a2..bdf8835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,7 @@ __pycache__/
 
 # C extensions
 *.so
-<<<<<<< HEAD
-=======
 
->>>>>>> a50fd0b ([0])
 .DS_Store
 # Distribution / packaging
 .Python