Fix B
Merge branch 'fix-B'
Add feature-C
Merge branch 'feature-C'