Fix merge conflict on index.php