test_branch
branch2
Merge branch 'test_branch'

Conflicts:
	test.txt