second commit
Merge branch 'master' into TestBranch
fourth commit
Merge branch 'master' into TestBranch

merging