Support use on either system, and with the NFS-based app
Conflict resolve