Fix compilation error after merge issues.