diff --git a/mkdocs.yml b/mkdocs.yml
index 731e8cf..8277b0f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -149,13 +149,6 @@ theme:
     - search.highlight # Highlight the search item in the page.
     - search.suggest # Suggest search results.
     - search.share # Deep-link to a search results page.
-<<<<<<< HEAD
-=======
-  # font:
-  #   text: Libre Baskerville
-  #   code: DM Mono
->>>>>>> 86b6f0a (Use gh pages.)
-  # Icons to use for different tags and the repo.
   font: false
   icon:
     annotation: material/plus-circle-outline