Describe the bug
See #6875 for details. We can enable merge queue to avoid such kind of conflicts. You can find out details here:
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
To Reproduce
No response
Expected behavior
No response
Additional context
No response