updated notes
resolved conflict