editing to bring all files back to life after rebasing