have email triggers in place + docs for them
fixed conflicts