new branch change
branch2 commit
Merge branch 'branch1'

Conflicts:
	test2.txt