New comment by jadynbrammer on void-packages repository

https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806462980

Comment:
After a refresh, github had an option to resolve the conflicts directly in the web page, so I did that. Hopefully that works! If not I can redo it if needed. Thank you for your help!