add --no-ff and merge alias