adding z
adding a
Merge branch 'test3'
adding b
adding b in test3
merge commit