branch test
AND simple
& simple
conflict fixed
modify agin
merge with no-ff
fix bug 101
merged bug fix 101
hou xu renwu  done
merged dev changed