diff --git a/mkdocs.yml b/mkdocs.yml
index f6ee9147528cef3622c3d7e93bca58c31c67b16b..015582cc51db25109325dc843701a6a5208b6acb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -15,13 +15,10 @@ theme:
   font:
     text: Inconsolata
     code: Courier Prime
-  feature:
-<<<<<<< HEAD
+  features:
 #    tabs: false
     - toc.integrate
-=======
     tabs: false
->>>>>>> 45ca770976413d8f1b0cb795f1343d27d4908e63
   logo: assets/013-radar.png
   favicon: assets/015-button.png
 nav: