commit
branch test
AND simple
& simple
fixed
nothing
merge with no-ff
bug
merged bug