merge-recursive: Save D/F conflict filenames instead of unlinking them