updated notes
fixed merge