change A file
Merge branch 'branchA' into branchB

Conflicts:
	TextA.txt