add dev text
merge with no-ff
master