Update .gitignore

.gitignore

@@ -21,10 +21,7 @@ lib64/
 parts/
 sdist/
 var/
-<<<<<<< HEAD
-=======
 wheels/
->>>>>>> 01dc3605361c82f5c9e192c87134210efb93856c
 *.egg-info/
 .installed.cfg
 *.egg
@@ -47,11 +44,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-<<<<<<< HEAD
-*,cover
-=======
 *.cover
->>>>>>> 01dc3605361c82f5c9e192c87134210efb93856c
 .hypothesis/
 
 # Translations
@@ -60,8 +53,6 @@ coverage.xml
 
 # Django stuff:
 *.log
-<<<<<<< HEAD
-=======
 local_settings.py
 
 # Flask stuff:
@@ -70,18 +61,13 @@ instance/
 
 # Scrapy stuff:
 .scrapy
->>>>>>> 01dc3605361c82f5c9e192c87134210efb93856c
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
 
-<<<<<<< HEAD
-#Ipython Notebook
-.ipynb_checkpoints
-=======
 # Jupyter Notebook
 .ipynb_checkpoints
 
@@ -114,4 +100,3 @@ ENV/
 
 # mypy
 .mypy_cache/
->>>>>>> 01dc3605361c82f5c9e192c87134210efb93856c