branch
and
& simple
conflict
add merge
merge with no-ff
fix bug
merged bug