edited from local machine. at this point one step behind remote branch
asdasd
merged
Merge branch 'master' of https://github.com/borkke/MyTest

Conflicts:
	test2.txt