Loss of progress after crashes

Other EverMerge issues: