uv

add conflict markers to the lock file

#9370

Merged