added foo
added foobar
added bar
Merge branch 'bar'
Merge branch 'foobar'