updated index page
merge conflict resolved