test branch
hotfix
branch2
Merge branch 'testBranch'

Conflicts:
	test/test.txt