another conflicting commit
Merge branch 'BranchForTestingMergeConflicts'

Conflicts:
	file10.txt