I have two computers, each were being used as a standalone work station. I have upgraded and have two new computers, but when I installed ATX, I went with network: server and workstation on one (computer A), and just workstation on the second (computer B). Using this ATX article I transferred the files from old computer A to new computer A. Old computer B has files that do not appear in ATX files from new/old computer A. Now that computer B is going to be using computer A as the server, I need to figure out how to merge the files from old computer B with the files now on new computer A. But everything I'm finding online is saying not to merge the files. I can't have one or the other...I need both sets of files from the old computers. Does anyone know how to go about this the right way?