update1
merge with no-ff