try to fix index file
update index in gh-pages
fix merging conflict for index in master