branch test
AND simple
& simple
conflict fixed
add one
add two
add three
add merge
merge with on-ff
fix bug01
merged bug fix 01
add dev
add four
fix conflict