Add feature-A.
Merge branch 'feature-A'
Fix B.
Fixed Conflict.
Add feature-C
Merge branch 'feature-C'