updated notes (testing git merge too)