másik
harmadik
Merge branch 'test2' into test

Conflicts:
	valami.txt