Added recent notes
fixed conflicts