new line in bla
Merge branch 'master' of https://github.com/kstanski/mTest.git

Conflicts:
	folder/bla.txt
Merge branch 'master' of https://github.com/kstanski/mTest

Conflicts:
	folder/bla.txt
fgdzh