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

Can you update the comment to indicate how a blockChecksum differs from a checksum?