Committing new branch
Merge branch 'testing'

Conflicts:
	test.file
added new file hotfix.file
Merge branch 'testing' containing new file
merged the repo