diff --git a/mkdocs.yml b/mkdocs.yml
index 79a22b0..731e8cf 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -115,15 +115,6 @@ plugins:
   - search
   # Plugin to create index pages for each section. [https://github.com/oprypin/mkdocs-section-index]
   - section-index
-<<<<<<< HEAD
-=======
-  # Plugin to manage social media cards. Requires installing: pip install "mkdocs-material[imaging]
-  # - social:
-  #     cards: true
-  #     cards_layout_options:
-  #       background_color: "#828089"
-  #       font_family: Libre Baskerville
->>>>>>> 86b6f0a (Use gh pages.)
   - tags
 
 repo_name: gugulet-hu/gugulet.hu