fix another merge error