fix a mismerge from earlier