FeatureA
featureB
merge FeatureA and FeatereB to master branch
merge FeatureC to master branch
adapt code and fix bug