one more file from local repo
local edit
Merge branch 'master' of github.com:shyam-s316/testgit

Conflicts:
	remotefile.txt
merge local with remote