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

This can be simplified to just `fsUtils.setChecksum(fs, path, checksum, callback);` since you don't do any special processing in the callback.