First commit on first branch
Commit first file on branch
Try to create conflict
Merge branch 'testbranch'

Conflicts:
	prova.txt
Merge branch 'master' of ssh://git@github.com/tim-mickelson/painkiller.git
Remove files to get more serious