checking conflict
Merge branch 'master' of https://github.com/dkarthi/Hello_World

Conflicts:
	sample.txt

resoved conflict