Merge Academy forgetting progress again

Occasionally, we all see messages about how something couldn't be saved; usually a "try again" fixes it.  Today, this is almost constant and we're also having to restart pretty often, too, actually l...