branch
AND simple
& simple
fix conflict
add merge
merge with no-ff
f2
fix bug 101
merged bug fix 101