added no fast forward merge alias