Rebased3 fix replay

Meld (merge resolution) cock-up I suspect...