diary with sunday's stuff added
fixed conflicts