Merge with rsync://fileserver/linux