New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/31534#issuecomment-866882454 Comment: Try rebasing on top of master and squash the two commits together.