Fixed another merge error