foo1
foo2
Merge branch 'foo'