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