New comment by abenson on void-packages repository https://github.com/void-linux/void-packages/pull/26088#issuecomment-724390923 Comment: If you rebase it'll fix the merge