Fixed rebase errors