fix a merge artifact that I'd missed