Add feature-A
Merge branch 'feature-A'
add feature-A 2
Fix B
Merge branch 'fix-B'
add feature-D
Add feature-A
Merge branch 'feature-A'
Merge branch 'fix-B'
Add feature-A
Fix B
Fix conflict