So if I can resurrect f2542cf:bundles/patches/libffi-3.0.4/src/powerpc/ffi.c with any filename in any directory, even if "bundles" does not exist anymore, hat did you mean by "If you merge it from a place where the file existed before"? Can you give me an example of what it would mean to merge it from a place where the file did not exist before?