Add feature-A
Merge branch 'feature-A'
Fix B
fix conflict