* fixed file rescue for orphaned merging