diff --git a/index.php b/index.php
index 19eb5bff74..349e1cc607 100644
--- a/index.php
+++ b/index.php
@@ -336,6 +336,7 @@ if ($a->module_loaded) {
 		$func = str_replace('-','_',current_theme()) . '_init';
 		$func($a);
 	}
+/// @TODO commented out? old-lost again? :-)
 //	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
 //		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
 //		if (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
@@ -376,27 +377,25 @@ if ($a->module_loaded) {
 
 /*
  * Create the page head after setting the language
- * and getting any auth credentials
+ * and getting any auth credentials.
  *
  * Moved init_pagehead() and init_page_end() to after
  * all the module functions have executed so that all
- * theme choices made by the modules can take effect
+ * theme choices made by the modules can take effect.
  */
 
 $a->init_pagehead();
 
-/**
+/*
  * Build the page ending -- this is stuff that goes right before
  * the closing </body> tag
  */
-
 $a->init_page_end();
 
 // If you're just visiting, let javascript take you home
-
-if (x($_SESSION,'visitor_home')) {
+if (x($_SESSION, 'visitor_home')) {
 	$homebase = $_SESSION['visitor_home'];
-} elseif (local_user()) {
+] elseif (local_user()) {
 	$homebase = 'profile/' . $a->user['nickname'];
 }
 
@@ -404,35 +403,35 @@ if (isset($homebase)) {
 	$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
 }
 
+<<<<<<< HEAD
 // now that we've been through the module content, see if the page reported
 // a permission problem and if so, a 403 response would seem to be in order.
 
+=======
+/*
+ * now that we've been through the module content, see if the page reported
+ * a permission problem and if so, a 403 response would seem to be in order.
+ */
+>>>>>>> 29f1028... Convention:
 if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
-/**
- *
+/*
  * Report anything which needs to be communicated in the notification area (before the main body)
- *
  */
-
 call_hooks('page_end', $a->page['content']);
 
-/**
- *
+/*
  * Add the navigation (menu) template
- *
  */
-
 if ($a->module != 'install' && $a->module != 'maintenance') {
 	nav($a);
 }
 
-/**
+/*
  * Add a "toggle mobile" link if we're using a mobile device
  */
-
 if ($a->is_mobile || $a->is_tablet) {
 	if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 		$link = 'toggle_mobile?address=' . curPageURL();