add new homepage
merge conflict