Adding Main Feature
Added FeatureA from branch FeatureA
Adding FeatureB
Adding FeatureA 2
Feature B2
Merge branch 'FeatureA'
Merging AB Conflict
Feature A Patch
Merge branch 'FeatureA'