There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org resolve-conflicts-1
https://github.com/void-linux/void-packages/pull/37083

Resolve conflicts, vol 1
None

A patch file from https://github.com/void-linux/void-packages/pull/37083.patch is attached