add dev description
 merger with --no-ff