make index page
fix conflict