no fast forward merge