Merge changes to promo email