fixed conflicts AGAIN
fixed conflicts AGAIN
fixed conflicts AGAIN
fixed conflicts AGAIN
add confirmation email for hunters