set proper from address name in daily email mailer
fix merge conflicts