branch test
AND simple
& simple
conflict fixed
add merge
merge with --no-ff
issue 01 fixed
merged bug fix 01
merge