fix merging derp regarding recovery