format front page
merge conflicts