first modification on ATestBranch
second change on ATestBranch
Merge branch 'master' into ATestBranch

Conflicts:
	TestGit/SomeTestFile.txt
Merge branch 'ATestBranch'

Conflicts:
	TestGit/SomeTestFile.txt