BranchA first commit
Commit 2 on branch a
Merge branch 'branchA'