first commit is different text
2nd
ff
hh
jlplp
Merge branch 'master' of https://github.com/PavloMyrotiuk/TestMerge into TestB

Conflicts:
	TestData.txt
Merge pull request #7 from PavloMyrotiuk/TestB

Test b