changed something
merge with no-ff
fix bug 101
deal wh
aaa
c
 e