I'd go with this... also because I don't think a) she's creative enough to pull off the "Bobby Ewing in the shower" retcon and b) the fans who like Merry seem to really like the idea that she got to keep more than one of the guys, so I doubt she'd change that.