fix accidental merge error