Sort out two copies of a file after a sync conflict

When the same file is edited in two places, OneDrive keeps both and adds a name to the copy. You decide which to keep.

1. Look for a file with a name like ’Report (Warren’s conflicted copy).docx’ next to the original.
2. Open both copies and compare them to see which has the changes you want.
3. Merge any wanted changes into one file.
4. Keep the correct file and delete the redundant copy.
5. Rename the keeper back to the clean original name if needed.
6. Avoid future conflicts by closing the file in one place before editing it in another, and waiting for sync to finish.