Branch a
Another commit
Merge branch 'branch-a'