fix merge screwup