commit ver1 local
Merge remote-tracking branch 'remotes/origin/ver1'

Conflicts:
	New Text Document.txt