fix up derps during merge