did last 3 changes in email
fixed conflicts, added last 3 changes