add merge
not use no-ff