Fix rebasing mess