merge with no-ff
add new
no bug
bug fix
fdsh
add dev