branch test
Merge branch 'branch1'

Conflicts:
	tmpdir/test2.txt