edited file2.txt from branch featureA
feature fertig (test1.txt)