del enline
merge with no-ff