line 2 changes in try to cause conflict
I resolved the conflicts   Merge branch 'master' of ssh://ssh.github.com:443/dnash21e/try_git

Conflicts:
	testme.txt
resetting to baseline