You'll notice
Files with unresolved merge conflicts now sync as-is with markers intact instead of blocking, and both sides are told.
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.