add index
Add feature-A
Merge branch 'feature-A'
Fix B
Fix conflict
Add Feature-C
Merge branch 'feature-C'