testfile.txt
added another line
committing change on master branch
Merge branch 'hotfix'

Conflicts:
	testapp/testfile.txt