branch test
add simple
& simple
comfict fixed
add merge'
merge with no-ff
fix bug 101
merged bug fix 101