Fix up build error from bad merge