uv

6ca33c71 - Fully support project level conflicts

Fully support project level conflicts There was a fair bit of support for project level conflicts missing from `UniversalMarker`. I think that's because my initial PR pre-dated the beefing up of `UniversalMarker`.