master commit 1
conflicts 1
commit 2
commit 3