updated the index page
Fixing conflicts