a-branch commit
master commit
Merge branch 'a-branch'