Fixed merge conflicts for homepage

Fixed merge conflict
Updated css and content for homepage