Dealing with yarn.lock conflicts

[bagedevimo]

Has anyone come up with a clean way of dealing with yarn.lock conflicts? Yarn itself tries to resolve the conflict using git commit data, but that obviously doesn't work with jj conflict markets (and I don't want to switch to git ones as they're just not as nice IMO). This leads to yarn install with a conflicted file just leaving to yarn exiting with an error, and me cleaning up yarn.lock manually. Just wondering if anyone has come up with any clever tricks for dealing with this better?