Fix merge error

[yhenry-cipherowl]

What changed? Why?

Fix the previous merge error

How did you test the change?

• [ ] unit test
• [ ] integration test
• [ ] functional test
• [ ] adhoc test (described below)

[cb-heimdall]

Review Error for zhanwu @ 2024-05-24 21:20:03 UTC User must have write permissions to review

[leozc]

+1 @jiezhang