diff --git a/admin/settings.php b/admin/settings.php
index a5ad4e79868..0ee67a3cc1d 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -21,7 +21,6 @@ $PAGE->init_extra($section); // hack alert!
 $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
 $return       = optional_param('return','', PARAM_ALPHA);
 
-<<<<<<< settings.php
 if (!isset($USER->adminediting)) {
     $USER->adminediting = false;
 }
@@ -35,10 +34,6 @@ if ($PAGE->user_allowed_editing()) {
 }
 
 $adminroot = admin_get_root();
-=======
-/// no guest autologin
-require_login(0, false);
->>>>>>> 1.40.2.3
 
 $root = $adminroot->locate($PAGE->section);