Update to fix merge problems