Rebasing changes