add email notification
fix conflict