commit 2 in master
commit 3 in branchA
commit 4 in branchA
commit 5 in branchA
Merge branch 'master' into branchA