add merge
merge with no-ff
fix the bug