okelah commit
add feature A
change files
Merge branch 'featureA'
merging