There's a merged pull request on the void-packages repository

Resolve conflicts, vol 1
https://github.com/void-linux/void-packages/pull/37083

Description:
None