v1
changes
Merge branch 'CustomerVersion'

Conflicts:
	MergeTest/File A.txt
	MergeTest/File B.txt