Excel & OneDrive Help
Excel Sync Conflicts on OneDrive — Recover Your Edits and Stop “We Couldn’t Merge the Changes”
First things first: when Excel says “we couldn’t merge the changes” or “your file wasn’t saved because we couldn’t merge your changes”, your work is almost never gone. OneDrive keeps both versions of the file when it can’t reconcile them — the trick is knowing where the second copy went. This page shows you how to find it, how to rescue edits with Version History, and how to stop the conflict happening again. If you’d rather someone did it with you, we’re a family-run Dorset IT firm that’s supported Microsoft software since 1995 — remote help from £20. Rated 4.9 on Google.
- ● Family-run since 1995
- ● 4.9 on Google
- ● Remote fixes from £20
What’s Actually Happening
Why Excel says it couldn’t merge your changes
When a workbook lives in OneDrive or SharePoint, Excel and OneDrive quietly merge everyone’s edits in the background — that’s how two people can type into the same spreadsheet at once. A sync conflict happens when two copies of the file drift apart in ways the merge engine can’t reconcile. The usual culprits:
- Offline edits reconnecting. You worked on the train or through a Wi-Fi dropout, and by the time your laptop got back online, the cloud copy had moved on too.
- Two machines holding different snapshots. A laptop and a desktop (or an office PC and a home PC) each edited their own cached copy of the workbook before either finished syncing.
- A collaborator’s connection dropping mid-save. Their half-uploaded changes and your changes land on the same cells, and Excel can’t decide whose version wins.
The important bit: this is not corruption, and it’s not something you did wrong. Excel is refusing to guess — which is the safe behaviour — and OneDrive’s response is to keep both versions rather than overwrite either one. Your job is simply to find the second copy, which is what the next section covers.
If nothing is syncing at all site-wide, it may not be your file — check the service itself with our free Is It Down? tool before you start troubleshooting.
// NEED THIS FIXED RIGHT NOW?
Skip the DIY — call 01202 775566 and we can be looking at your screen within minutes. You watch everything we do, and most problems on this page are fixed in one short remote session. (Mon–Fri, 9am–5pm.)
Recovery First
Your edits are almost certainly not lost — find the conflict copy
When OneDrive can’t merge an Office file, it resolves the stand-off by keeping both versions. One stays under the original name; the other is saved as a duplicate conflict copy, typically in the same folder with something extra in the filename — often your computer’s name or the word “copy”. So the edits you think vanished are usually sitting a few rows down in File Explorer.
- Open the folder the workbook lives in (in File Explorer under your OneDrive folder, or at onedrive.com) and sort by Date modified.
- Look for a near-identical filename stamped with a PC name or “copy”, modified at the time you were working.
- Open both files side by side. One will hold your missing edits; the other holds everyone else’s. Decide which is the keeper, copy any stray changes across, then rename or delete the spare so nobody edits the wrong one next week.
Also check the Excel error message itself if it’s still on screen — the “a copy has been created” wording usually tells you it has parked your version for you.
In our experience most conflicts are fully recoverable this way, though we won’t pretend every single one is — if the copy simply isn’t there, move on to Version History below, and if that fails too, give us a ring before you do anything drastic.
The Safety Net
Rescue lost edits with Version History
Every Office file stored on OneDrive or SharePoint keeps a trail of earlier versions, and it’s the cleanest way to compare “before” and “after” when a conflict has muddled things. Two ways in:
- From File Explorer or onedrive.com: right-click the workbook and choose Version history.
- From inside Excel: click the file’s name in the title bar at the top of the window, then choose Version History.
You’ll see a dated list of saves. Open any version and it loads read-only alongside your current file, so you can eyeball the differences, copy rescued cells across, or click Restore to roll the whole workbook back. Nothing is overwritten when you open an old version to look — browsing is completely safe.
A quiet word of honesty while you’re here: Version History is a brilliant safety net, but it is not a backup — if the file itself is deleted, overwritten by ransomware or lost with the account, the history goes with it. We’ve written up whether Microsoft 365 needs a separate backup if that thought nags at you.
Prevention
Stop the conflicts happening again
A one-off conflict is bad luck. Weekly conflicts mean something in the setup is fighting you. Work down this list:
- Turn AutoSave on. The toggle sits at the top-left of Excel’s window. With AutoSave on, changes stream to the cloud every few seconds, so two machines rarely drift far enough apart to collide. You can make it the default under File > Options > Save. If the toggle is greyed out, the file either isn’t stored on OneDrive/SharePoint or is in the old format — see the next point.
- Convert legacy .xls files. Microsoft’s co-authoring only works with .xlsx, .xlsm or .xlsb files stored on OneDrive, OneDrive for Business or SharePoint. An old .xls workbook can’t merge changes at all — File > Save As and pick Excel Workbook (.xlsx). If you’ve inherited a folder full of ancient spreadsheets, our Excel spreadsheet rescue service sorts them out properly.
- Use Excel for the web for busy shared sessions. When five people hammer the same sheet on month-end day, the browser version syncs fastest — the smaller the sync window, the smaller the chance of a conflict.
- Know how Files On-Demand behaves. Online-only files (the cloud icon) download when opened; edits made while you’re offline queue up and sync later — which is exactly the moment conflicts are born. If you routinely work offline, expect to check for conflict copies when you reconnect.
- Reset the Office Document Cache if uploads wedge. When Excel forever says “uploading…” or “upload pending”, the local cache has usually jammed. Check nothing genuinely is waiting to upload, close all Office apps and pause OneDrive, then rename the folder at
C:\Users\<name>\AppData\Local\Microsoft\Office\16.0\OfficeFileCache(paste%localappdata%\Microsoft\Office\16.0\OfficeFileCacheinto the File Explorer address bar to jump straight there). Office rebuilds a fresh cache on next launch. - Keep shared workbooks off Dropbox, Google Drive and mapped network drives. Office co-authoring genuinely does not work there — only OneDrive and SharePoint support it. Files shared any other way will produce duplicate copies and lost-edit headaches, no matter how carefully everyone behaves.
Related Snag
Locked for editing?
A close cousin of the sync conflict: Excel announces the file is “locked for editing by another user” — sometimes claiming it’s locked by you. Nine times out of ten it’s a phantom lock: the file is genuinely open on another of your devices (including the Excel app on your phone), or Excel closed without releasing its lock.
- Close the file everywhere — every PC, laptop, tablet and phone that might have it open, including browser tabs with Excel for the web.
- Wait a few minutes. Stale locks normally release on their own once every session has closed.
- Still locked? Clear the Office Document Cache using the steps in the prevention list above — a wedged cache is the usual cause of a lock that refuses to die.
And a reminder from the same Microsoft guidance: if the file is an old .xls, it can’t be co-authored at all, so one person opening it locks everyone else out by design. Converting to .xlsx fixes that permanently.
When to Call Us
If your team hits this weekly, the files live in the wrong place
The steps above will rescue today’s workbook. But if merge conflicts, duplicate copies and “who’s got the latest version?” emails are a weekly event in your business, the real problem is usually structural: spreadsheets bouncing round as email attachments, living in Dropbox, or sitting on an old mapped drive — none of which can co-author. We taught Excel for over 10 years at our own Dorset Microsoft Education Resource Centre, and proper co-authoring is the number one thing small teams are never shown.
Here’s how we help, honestly priced:
- Remote rescue of a conflicted workbook — from £20. We connect (with you watching), find the surviving copies, merge the edits back and leave the file tidy. See how our remote support works — it’s the same friendly service whatever make of PC you own.
- Managed Microsoft 365 — £4.85 per user per month. We set up OneDrive and SharePoint properly, move your shared files somewhere they can actually co-author, and show the team how to use it. More on our Microsoft 365 support page.
- Ongoing cover — business support plans from £24.38 a month per computer (home plans £18.25), and every session ends with a written Service Report so you can see exactly what was done and why.
We’re remote-first — most Excel and OneDrive problems never need a visit — but we’re local too: on-site around Bournemouth, Poole and Dorset when it helps, free local collection if hardware’s involved, and meetings by appointment at Kinson Community Centre. No call centre; you’ll get the same familiar faces each time. Mon–Fri 9–5 on 01202 775566, or text 07520 615332.
FAMILY-RUN SINCE 1995 · ★ 4.9 ON GOOGLE · 200+ COMPUTERS UNDER OUR CARE · NO FIX, NO FEE · SAME-DAY REMOTE SUPPORT
// GOOD QUESTIONS
Frequently asked
Excel says it couldn’t merge my changes — is my work gone?
Almost certainly not. When OneDrive can’t merge an Office file it keeps both versions — one under the original name and one as a duplicate conflict copy, usually in the same folder with your computer’s name or the word “copy” in the filename. Sort the folder by date modified and open both. If the copy isn’t there, Version History is the next place to look. Most conflicts are fully recoverable, though we’d never promise every single one is.
What actually causes the “we couldn’t merge the changes” error?
Two copies of the workbook drifted apart in ways Excel couldn’t safely reconcile — typically offline edits reconnecting, a laptop and a desktop each holding a different cached snapshot, or a collaborator’s connection dropping mid-save. Excel refuses to guess whose changes win, and OneDrive keeps both versions instead of overwriting either.
Where does OneDrive put the conflict copy?
In the same folder as the original, under a near-identical name — typically with the computer’s name or “copy” appended. Check in File Explorer under your OneDrive folder and at onedrive.com, sorting by date modified around the time you were working.
How do I get an older version of my spreadsheet back?
Right-click the file in File Explorer or at onedrive.com and choose Version history, or click the file’s name in Excel’s title bar and choose Version History. Earlier versions open read-only so you can compare safely, copy rescued cells across, or restore the whole file.
Is Version History the same as a backup?
No. It’s a safety net attached to the file — if the file itself is deleted, encrypted by ransomware or lost with the account, the history goes with it. We’ve written a plain-English guide on whether Microsoft 365 needs a separate backup at /microsoft-365-backup-do-you-need-it/.
Can two people edit the same Excel file on Dropbox or Google Drive?
Not with Office’s co-authoring, no. Real-time merging of changes only works for files stored on OneDrive, OneDrive for Business or SharePoint. Workbooks shared via Dropbox, Google Drive or a mapped network drive will produce duplicate copies and overwrite headaches sooner or later, however careful everyone is.
Why is AutoSave greyed out or turning itself off?
AutoSave only works for files saved to OneDrive or SharePoint in a modern format. If the workbook is on your local disk, a network drive, or is an old .xls file, the toggle stays off. Save the file to OneDrive as .xlsx and the toggle comes to life; you can make AutoSave the default under File > Options > Save.
Excel says the file is locked for editing — by me. What’s going on?
A phantom lock. The file is usually still open on another of your devices — including the Excel app on a phone or a forgotten browser tab — or Excel closed without releasing its lock. Close it everywhere, wait a few minutes, and if it persists clear the Office Document Cache (the folder at %localappdata%\Microsoft\Office\16.0\OfficeFileCache) with all Office apps closed.
Does the old .xls format make conflicts worse?
Yes. Co-authoring requires .xlsx, .xlsm or .xlsb files stored on OneDrive or SharePoint, so an .xls workbook can’t merge changes at all — one person opening it locks everyone else out. Use File > Save As to convert it, or if you’ve a whole folder of legacy spreadsheets, our Excel spreadsheet rescue service can modernise the lot.
What does it cost to have 365 Techies sort this out?
Remote help starts from £20 — enough for us to connect, recover the conflict copies and merge your edits back while you watch. Managed Microsoft 365 is £4.85 per user per month, and ongoing business support plans start from £24.38 a month per computer with a written Service Report after every session. Diagnosis first, honest quote before any bigger job. Mon–Fri 9–5 on 01202 775566.
An afternoon of edits at stake?
One of our techies can remote in, find the surviving copy and merge your work back together — usually from £20. Mon–Fri 9–5. Call 01202 775566 or text 07520 615332.
01202 775566 · help@365techies.co.uk · MON–FRI 9AM–5PM