merge with no-ff