Pants On Fire - fix merge problem…