notes from meetup
updated snippets
fix conflict