edited file2.txt from branch featureA