diff --git a/docs/website/inc/page-header.php b/docs/website/inc/page-header.php
index 6fa74c3b..0bb3ef61 100644
--- a/docs/website/inc/page-header.php
+++ b/docs/website/inc/page-header.php
@@ -17,11 +17,7 @@ if ( isset($title) ) {
   echo $title;
 }
 else {
-<<<<<<< HEAD:docs/website/inc/page-header.php
   echo "DAViCal CalDAV Server";
-=======
-  echo "DAViCal";
->>>>>>> Rename to DAViCal in the documentation.:docs/website/inc/page-header.php
 }
 ?></div>
 <div id="subTitle">A CalDAV Store</div>