Rebase error fixed