dissociate backup and nfs, to be able to use nfs without backup
resolve merge conflicts