Fix dumb merge error that breaks the build.