added mailer to send email when canary gets a heartbeat after being dead
deleted tmp file
fixed merge conflict