Rebase aliases tweaked
Added m alias for merge