Branch B
Merge branch 'BranchB'

Conflicts:
	BranchB.txt
Change made in master which should conflict