updated notes.md
 resolved merge conflict in notes.md