Fixed rebase action