This is the finished merge of the two versions of the RAW image. Note that the sky and water in the foreground are from the First Conversion, yet the mansion and the stone wall are from the Second Conversion.

This image could still benefit from some burning of the shadows in the mansion and stone wall ~