fix index.php merge conflicts