Fixes to page.tpl.php for merge conflicts