readme changed 8
added test1
changed readme -- conflicted change
test2 added
Merge branch 'develop' of https://github.com/ndemshev/git-test into branch2

Conflicts:
	README.md
Merge commit 'a947dd506cfbea081409948cd7bc63130869d77d' into branch2

Conflicts:
	README.md