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