add merge
merge with no-ff
fit bug 101