fix merge fallout (take 2)