[#80334374] Fix merge-related compile error.