Is there any way to undo the merge once it's been saved?

Nope. Break out the Quick Mask...