Add foo.txt
Add foo.txt bar.txt
Merge branch 'monkey'