diff --git a/mkdocs.yml b/mkdocs.yml
index d12c69d6a0dbc3e8f2cf86388c3d27fe20fbfe66..f0333d99c07b536a7c919dc1df6c6cc92e407ea2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -190,13 +190,8 @@ pages:
 extra:
   logo: img/logo2.png
   palette:
-<<<<<<< HEAD
     primary: 'blue grey'
     accent: 'light blue'
-=======
-    primary: 'blue grey'
-    accent: 'red'
->>>>>>> Setting color to: red
   font:
     text: 'Roboto'
     code: 'Roboto Mono'