branch dev test
and simple
& simple
conflict fixed
add insert
merge with no-ff
fix bug 12
merged bug fi 12