rebase error fixed