add merge
merge with no-ff
del merge
del merge