fix a merge error, and fix an issue with foodstampable housecoupons