branch test
AND simple
& simpile
conflict fixed
add merge
merge with no-ff
Fix issue-101
merge bug fix 101