branch test
AND simple
and simple
conflict fixed
add one line text.
merge with no-ff
fix bug
merged bug fix