branch test
AND simple
simple
fix conflict
add merge
merge with no-ff
fix bug 101
merged bug fix 101
add dev mode
added in zzh branch