testB 2nd
TestB 3rd
TestD 1st
Merge branch 'TestD'

Conflicts:
	sample.txt