update index page
merge