created a future merge conflict and added notes.md for shared notes
 resolved the merge conflict we created manually