edited index.php to resolve mergeissue