Cloud file sync now detects and syncs files with unresolved merge conflicts

Cloud file sync now detects files with unresolved merge conflicts by inspecting snapshot.conflicted. When such files exist, sync uploads them as-is with conflict markers intact instead of blocking, and notifies both the user and the cloud session.