Fix merge conflicts and style home page masthead teaser block
Fix merge conflicts in snap_home