recovering from the git fiasco