branch test
test1-2
Delete test section
AND simple
& simple
conflict fixed
Add merge
merge with no-ff
fixed bug 101
merged bug fix 101