Versuch nach Master2 zu committten
Merge branch 'master2'

Conflicts:
	dummyfile1.txt.txt