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

well if true, it has to process it first, i.e. append the checksum and then push to the list