branch test
ADD simple
& simple
confict fixed
add merge
merge with no--ff
fix bug 101
merged bug fix 101