Fix up merge mistake.