branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
bug fix
merged bug fix
recovered from stash
done