add error stabilization detection
resolve merge conflict
Merge branch 'pid' of https://github.com/jnmacdnld/toss-up into pid