add merge
\n
merge with no-ff