Create test4.txt
Merge remote-tracking branch 'upstream/testBranch'