change homepage and add news category
merge conflict