Fixed bugs in git merge and added index.php