Anpassung Projektfiles
Merge conflicts