initial 1
initial 12
initial 123
my-branch conflict
master conflict
branch 2
manual merge
22
33
Merge branch 'my-branch'