diff --git a/docs/source/conf.py b/docs/source/conf.py
index b7fe46549f..1fa6e4a1e2 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -148,16 +148,6 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-<<<<<<< HEAD
-=======
-
-html_theme_options = {
-    'includehidden':True,
-    'collapse_navigation':False,
-    'sticky_navigation':True,
-    'titles_only':True
-}
->>>>>>> release/4
 
 html_theme_options = {
     'includehidden':True,