diff --git a/core/config.php b/core/config.php
index 06b9626..91f87cd 100644
--- a/core/config.php
+++ b/core/config.php
@@ -11,7 +11,11 @@ if($devmode) {
      error_reporting(E_ALL);
 }
 
+<<<<<<< HEAD
 $pagename = ucfirst(str_replace(".php", NULL, str_replace("/", NULL, $_SERVER['DOCUMENT_URI'] ?? $_SERVER['PHP_SELF'] )));
+=======
+$pagename = ucfirst(str_replace(".php", NULL, str_replace("/", NULL, $_SERVER['PHP_SELF'])));
+>>>>>>> 6012a70747696acdfc3b5b1b3a0950d749c8736a
 
 $maintainers = array("Mario1", "qzip", "nolanwhy");