dev
dev add1.js
and simple
& simple
conflict fixed
bug ok
merge bug fix
stash