sample file by dev 1
Merge conflict resolved
	SampleFile.txt