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

just did...added more on the next line