new file in feature B
Merge branch 'featureB'