New Branch commit
New Branch commit
Merge branch 'master' into MyNewBranch
New Branch commit
Test 1
Test 1
Merge branch 'MyNewBranch' into master2

Conflicts:
	Test.php