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

You're intentionally not adding this diffNode to the list in the `options.versions===true` case, correct?