Resolves merge conflicts.

[rr-mark]

Description

Please explain the changes you made, including a reference to the related issue if applicable

Checklist

• Required by CI: Code is auto formatted using clang-format
• Extend the tutorials / documentation reference
• Document API changes relevant to the user in the MIGRATION.md notes
• Create tests, which fail without this PR reference
• Include a screenshot if changing a GUI
• While waiting for someone to review your request, please help review another open pull request to support the maintainers

[mergify]

Please target the main branch for development, we will backport the changes to mergify/bp/humble/pr-3357 for you if approved and if they don't break API.

[codecov-commenter]

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.37%. Comparing base (af4ebb0) to head (ea47a95).
Report is 1 commits behind head on mergify/bp/humble/pr-3357.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@                      Coverage Diff                       @@
##           mergify/bp/humble/pr-3357    #3366       +/-   ##
==============================================================
+ Coverage                           0   51.37%   +51.37%     
==============================================================
  Files                              0      382      +382     
  Lines                              0    31902    +31902     
==============================================================
+ Hits                               0    16387    +16387     
- Misses                             0    15515    +15515     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.