Fixed #20814 -- improved misleading clash error messages