Added merge --no-ff alias