Fix another merge error.