Add Text A
Merge branch 'branchA' into branchB