write basic index page
fix merge conflicts