master: a
taskX: merge master
taskX: 2