merged computers. paths will be off, but files are up to date