update to weekly mailer
merge conflicts