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