Foo
Merge branch 'master' into test
Bar
Merge branch 'test'