add merge dev
merge with no-ff