avoid usage of FF
merge with no-ff