local conflict
Merge branch 'master' of https://github.com/pravi10/TestRepo

Conflicts:
	SampleCode.txt.txt