backed out changes to mailmerge