Always link symlinks directly
Handle conflicts where links point at symlinks

Fixes #30664.