Fix #372 - Do not create conflicted copies if the client has a newer version of a file, and upstream that file

I wonder how we should deal with the `NOMTIME` flag being set for the filesystem, see https://github.com/filerjs/filer#filerfilesystemoptions-callback-constructor.  It would break your expectations here.