confirmation email working
fixed merge conflict