How do I merge the original and edited photo?
I have recently combined my iPhoto and Aperture libraries into one library. After doing this, I've had an issue with one project, where some photos show up twice, in their original un-edited form and the edited version (that I originally edited in Aperture). Problem is, I have since deleted the original files to let iPhoto/Aperture manage my library, and now I can't really use the edited version since it can't find the reference file (which is now located somewhere in the library, but not on the disk itself).
Is there anyway to "stack" the two photos, so I have the reference file in the Library but with my original edits applied?
Here is the edited photo (notice the icon in the lower-right corner, which I'm not familiar with):
And here's the original, which I want the edited photo to use as a reference/"master" (I also have no idea what the icon in the corner means):
Aperture 3, Mac OS X (10.7.5)