diff --git a/content/_index.md b/content/_index.md
index 011cbcd7b..d2b976527 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,7 +7,6 @@ draft: false
 extra:
   author: Your name here
   imgPath: images/threefold_globe.png
-<<<<<<< HEAD
 ---