diff --git a/_config.yml b/_config.yml
index 313e2bd..c990600 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,7 +14,6 @@ timezone:
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------
 
-<<<<<<< HEAD
 title: Comprofix # the main title
 
 tagline: Geek | Nerd | Systems Administrator | IT Specialist  # it will display as the subtitle