Another merge problem cleared up.