fix another merge problem