modified test
add merge
merge with no-ff
fix bug 101
merged bug fix 101
add module
fix conflict
fix