Update mailer for send file
fix merge