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