Feature-A: modified File Test1.txt
EntwicklerA: test1.txt modified again
Merge branch 'feature-a'