hello
AND
& simple
conflict fixed
add merge
merge with no-ff
fix bug 1o1
merged bug fix 1o1