message confirmation email setup revised
fix merge conflict