uv

2bda549b - uv-resolver: fix lock file instability with conflict markers

uv-resolver: fix lock file instability with conflict markers This does the work to parse conflict markers back into a series of conflict inclusions and exclusions that can be used during resolution. Fixes #9735