fix query bug
fix merge
add nodemailer
confirm delete