joined the two files from each computer