updated mailers
updated mailers and merging conflicts