fixed the index.php file (merging error)
fixed the header.php file