front page
fix conflict