added line2 to bla.txt
added file3
add masterfile
change masterfile
change masterfile again
change file3
change file3 2
change file3 3
yet another change to masterfile.txt
changed hello in testing branch
add line to hello in master branch
Merge branch 'testing'

Conflicts:
	hello.txt
remove hello
remove hello.txt
hotfix1 change to bla.txt
hotfix2 change to bla.txt
second change to bla.txt for hotfix2
Merge branch 'hotfix2'

Conflicts:
	bla.txt

complete merge for bla.txt
Merge branch 'testing'

merge testing