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

Mixing singular and plural for `checksum` vs. `checksums` is confusing.