add merge
add no-ff
add merge
merge with no-ff