updated index page
more merge conflict resolution