Fixed another merge error.