try to fix patch after upstream commit (untested)
Merge branch 'master' of https://github.com/psi-plus/main