added foo
added bar
Merge branch 'tstbranch-2' (modified comment)