add merge
no fast forward