email alert trans
fixing merge conflicts