Test commit b 1
Test commit b 2
Merge branch 'master' into blah
Merge branch 'blah'