new homepage content
fixing merge conflict