Fixed merge conflicts on homepage.