5 z 1
Merge branch 'branch-1' of https://github.com/atomchuck/test-project into branch-1

Conflicts:
	folder1/New Text Document.txt