Fix rebasing issues.