I think the latter is the first thought whether or not you have a backup to recover the situation, and that is my point in a nutshell.
Not in general, but for a given file, it seems that's all Steam's cloud sync does when the file exists on both sides. I can't see any indication of conflict resolution. There may be no satisfactory solution under Wube's control, because of limitations of Steam's cloud sync.