add merge
merge with no-ff
fix bug 101
add forbiding fast-forward
forbid ff