new index
index page
merge fix