Fix the incorrect merge conflict resolution in #88.

[weiiwang01]

What this PR does

Fix the incorrect merge conflict resolution in #88.

Why we need it

Fix the incorrect merge conflict resolution in #88.

Checklist

• I followed the contributing guide
• I added or updated the documentation (if applicable)
• I updated docs/changelog.md with user-relevant changes
• I used AI to assist with preparing this PR
• I added or updated tests as needed (unit and integration)
• If integration test modules are used: I updated the workflow configuration
  (e.g., in .github/workflows/integration_tests.yaml, ensure the modules list is correct)
• If this is a Grafana dashboard: I added a screenshot of the dashboard
• If this is Terraform: terraform fmt passes and tflint reports no errors
• If this is Rockcraft: I updated the version