manual rebase files were currupted