Mailer is working
merge conflict cleared
fixed follow on post bug
fixed edit my tag bug