changed foo, added bar
add baz.txt
Merge remote-tracking branch 'upstream/master'
changed baz