add merge
merge with noff