Fix rebasing error