corrected error that happened when rebasing