modify README.md in brach dev
add merge
merge with no-ff