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

This was done intentionally to line up with the new part of the comment viz. resolveFromArray