New comment by ndowens on void-packages repository https://github.com/void-linux/void-packages/pull/15919#issuecomment-548328370 Comment: Will fix the merge conflict ASAP