change dev readme
merge no-ff