yet another line from local added
Merge branch 'master' of ssh://git@github.com/pavelfomin/testrepo.git

Conflicts:
	test1.txt