fix the errors generated during rebasing