I needed to keep the original. I used the Resolve Conflict function to fix as many as it would allow. I had to "manually" fix the reset by opening Properties for all the problem VIs. Just opening Properties identified the conflict allowed me to select the .ctl that I wanted to use. It took a while but the conflicts were finally resolved.
