created homepage
fix conflict