neue Branch.
nicht commitiert.
delete.
merged?
ja
Merge branch 'DritteBranch'

Conflicts:
	Tierpopulation/testFile