Notification email
fix merge