Fixed rebase error