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