weekly email #4
fixed conflicts