fix another merge artifact