add f1
merge with no-ff