Rodolfo M. Raya wrote: >Anyway, it's a lot easier to use a graphical tool. > > Yeah, it is. But I was wondering if there was an automated way to resolve conflicts. Searching through the manual, I found that this has to be done by hand, which is very tiresome if many strings have conflicts. Thanks for your help, anyway.