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