commit 2
Merge conflict removed
	SampleFile.txt