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

we can address it in https://github.com/mozilla/makedrive/issues/447