joy may signal a resolved problem
But then the conflict is gone. So I don’t think revision #1741 addresses #1730.