feature-A
asdfa:
Merge branch 'feature-C'