master conflict
Merge branch 'BranchForTestingMergeConflicts'

Conflicts:
	file10.txt
master conflict again
Merge branch 'BranchForTestingMergeConflicts'

Conflicts:
	file10.txt