new branch
no message
Merge branch 'test2' into test

Conflicts:
	test.txt