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

https://github.com/mozilla/makedrive/pull/443/files#diff-c3ede5b5250ec9a7181630da3090839aR211 uses it to manage error states...its kinda equivalent to pathCache in a way