tolles Branch
Merge branch 'MyBranch'

Conflicts:
	konflikt-hier.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	konflikt-hier.txt
ljfwoihfw^^