Edited testfile in hotfix branch
Editing testfile.txt
Merge branch 'hotfix'

Conflicts:
	testapp/testfile.txt