rebase command fixed