FratureA
Fix in FeatureA
Finish FeatureA
Merge branch 'featureA'