add new branch
AND simple
& simple
conflict fixed
no diff
merge with no-ff
fix bug 101
merged bug 101