test.txt
Merge branch 'than1' into than

Conflicts:
	test2.txt