add merge
merge with no -ff