no-ff merge alias