fix another mismerge