diff --git a/docs/conf.py b/docs/conf.py
index 9df2f92..f57a973 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,10 +25,19 @@ import datetime
 html_last_updated_fmt = "%Y-%m-%d %H:%M:%S"
 
 extensions = ['sphinx.ext.autodoc',
+<<<<<<< HEAD
     'sphinx.ext.doctest',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
 'juliadoc.julia', 'juliadoc.jlhelp', 'numpydoc']
+=======
+              'sphinx.ext.doctest',
+              'sphinx.ext.coverage',
+              'sphinx.ext.viewcode',
+              'juliadoc.julia',
+              'juliadoc.jlhelp',
+              'numpydoc']
+>>>>>>> 8009aab1bd4677280fd9c600d6975c7a0b7f31de
 html_theme_path = [juliadoc.get_theme_dir(), sphinx_rtd_theme.get_html_theme_path()]
 html_sidebars = juliadoc.default_sidebars()