re-applied my earlier stashed changes