modify for branch
Merge branch 'branch1'

Conflicts:
	test.txt