diff --git a/doc/source/conf.py b/doc/source/conf.py
index a8c6dd9a6f1417cbae30dcbe9310c0441238fc4a..bbb7a3e5462bd16caa423f1188db0286e91f0d23 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -41,12 +41,7 @@ extensions = ['matplotlib.sphinxext.only_directives',
               'sphinx.ext.todo',
               'sphinx.ext.coverage',
               'sphinx.ext.mathjax',
-<<<<<<< HEAD
               'sphinx.ext.viewcode']
-=======
-              'sphinx.ext.viewcode',
-              'sphinx.ext.graphviz']
->>>>>>> 73c7bc85414d44623136d742f4718180b1852277
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']