fixing merge conflicts for homepage