implemented progress notes
fixed conflicts