fix an apparent merge error