testing commit1 line3
new hello world commit1 line3 and line5
master commit1
Merge branch 'master' into testing
testing commit2
master
branch1
branch2
merge master