// ONEDRIVE SUPPORT
OneDrive says it couldn’t merge the changes in an Office file
You press save and Word or Excel comes back with a box: it could not merge the changes, would you like to save a copy? It is one of the more alarming messages in Office, because it sounds like your afternoon’s work is about to vanish. It is not. It means two versions of the file now exist — the one on your screen and the one in the cloud — and Office does not know how to combine them. Here is the one thing to do before anything else, what actually causes it, and how to make it stop coming back. Rated 4.9 on Google.
- ● No fix, no fee
- ● Rated 4.9 on Google
- ● Trading since 1995
/01 — FIRST, KEEP YOUR WORK
Before you click anything: save a copy somewhere else
Do not close the file, do not click the option that sounds like it will overwrite something, and do not try to fix the sync while the document is open. First make your version safe. Use File, then Save a Copy or Save As, and put it on the Desktop with a new name — proposal-mine.docx, anything. The moment that copy exists, nothing on this page can lose your work.
Then look at what the cloud has. Open OneDrive in a web browser and open the same file there. Sometimes it is identical to yours, sometimes it is missing your last hour, and sometimes it has a colleague’s changes that you do not. Now you can decide calmly: keep yours, keep theirs, or open both side by side and merge the difference by hand. Office offers the same choice in its own words — keep both, keep your version, or keep the copy in the cloud — and keeping both is never wrong.
What you are seeing is not corruption. The file is fine. It is a disagreement about which of two versions is the real one, and you have just made sure you are holding one of them.
// WINDOWS PCS ONLY
We do not support OneDrive on Apple Macs, iPads or iPhones. Apple does not allow our remote-support tool to take control of an iPad or iPhone (an Apple restriction), and our remote support covers Windows PCs only. On an Apple device, Microsoft’s own OneDrive help is the place to start.
// FIX IT WITH ME · STEP BY STEP
Clear the merge error, step by step
The steps from this guide, one at a time, in the order that fixes the most cases fastest. Tell it what happened and it shows the next step. Nothing here leaves your device.Last reviewed 6 October 2026
-
01Save a copy safely before you click anything
Do not close the file, do not click the option that sounds like it will overwrite something, and do not try to fix the sync while the document is open. First make your version safe. Full detail in the guide below ↓
Has the error gone? -
02Untangle the cache that repeats the error
If the message comes back on every save of every file, the collision is not in your documents any more — it is in the bookkeeping. Office keeps a local cache of files on their way to the cloud, and when that cache gets tangled it reports a merge problem for files that have no conflict at all. Full detail in the guide below ↓
Has the error gone? -
03Deal with the conflict copies afterwards
After a collision you will often find two files where there was one: the original, and a copy whose name has your computer’s name or the word conflict added to the end. OneDrive made it deliberately, to keep both versions rather than guess. Full detail in the guide below ↓
Has the error gone?
Rather have it done for you? Remote help from £20, or in person across Bournemouth, Christchurch, Poole, Ringwood and the New Forest, with no call-out fee.
Sorted{mins}. Nice work.
Open, edit and save the file once more to be sure it syncs cleanly.
Still erroring after all three steps? That is a remote job.
With your permission we connect to your screen and sort it in one session. Usually the same day, remote help from £20, and no fix, no fee.
OneDrive says it couldn’t merge the changes in an Office file - the fix order (365techies.co.uk/onedrive-couldnt-merge-changes/) 1. Save a copy safely before you click anything: Do not close the file, do not click the option that sounds like it will overwrite something, and do not try to fix the sync while the document is open. First make your version safe. 2. Untangle the cache that repeats the error: If the message comes back on every save of every file, the collision is not in your documents any more — it is in the bookkeeping. Office keeps a local cache of files on their way to the cloud, and when that cache gets tangled it reports a merge problem for files that have no conflict at all. 3. Deal with the conflict copies afterwards: After a collision you will often find two files where there was one: the original, and a copy whose name has your computer’s name or the word conflict added to the end. OneDrive made it deliberately, to keep both versions rather than guess. Still stuck? 365 Techies fix it remotely: 01202 775566 - https://365techies.co.uk/remote-support//02 — WHAT CAUSES IT
How a file ends up with two versions that Office cannot reconcile
Office can merge simple changes from two places when it is allowed to watch both happen — that is co-authoring. The merge fails when it was not watching, or when the file contains something it cannot merge. Nearly every case is one of these.
- You edited it on two devices. Open on the laptop, edited on the desktop, saved on both. Each save raced the other to the cloud.
- Someone else edited it outside co-authoring. A colleague opened the same file in desktop Excel with AutoSave off, or from an emailed copy, and saved over the cloud version while yours was open.
- OneDrive was paused or offline while the file was open. You worked through a train journey; the cloud copy moved on without you; the first save on reconnecting collided with it.
- The file contains something Office cannot merge. Macros, some legacy features, and above all the old formats — .xls and .doc rather than .xlsx and .docx. Old-format files cannot co-author at all, so every simultaneous edit becomes a collision.
- One folder, two OneDrives. A folder synced to a personal OneDrive on one PC and a work one on another produces this endlessly.
/03 — WHEN IT HAPPENS EVERY TIME
The tangled cache that repeats the error on every save
If the message comes back on every save of every file, the collision is not in your documents any more — it is in the bookkeeping. Office keeps a local cache of files on their way to the cloud, and when that cache gets tangled it reports a merge problem for files that have no conflict at all.
Clearing it is safe once your open work is saved. Close every Office program. Then either use the button Office provides for it — in File, Options, under Save, there is an option to delete the cached files — or, with Office fully closed, the Office document cache folder under your local Office data can be removed and it rebuilds itself on the next open. Then pause OneDrive from its icon by the clock and resume it, so it re-checks its own queue. If it still misbehaves, sign out of OneDrive and back in.
One habit worth building while you are at it: look at the OneDrive icon before you start a long editing session. If it is paused or showing a problem, sort that first, because a file edited for three hours while sync was stopped is a merge error waiting to happen.
/04 — STOP IT COMING BACK
Four habits that end merge errors for good
- Turn AutoSave on and leave it on. The switch at the top-left of Word and Excel. With it on, every change goes to the cloud as you make it and Office can see what everyone is doing. With it off, you are saving in large lumps that collide.
- One file, one place. Everyone opens the document from the shared location — the OneDrive or SharePoint folder — never from an emailed copy or a download. An emailed copy is a fork, and forks do not merge.
- Use the modern formats. Save old .xls and .doc files as .xlsx and .docx once, and the collisions from that source stop. Spreadsheets with macros need the macro-enabled format and still will not co-author; those want one owner at a time.
- For shared spreadsheets, edit in the browser. Excel in the browser co-authors cleanly and cannot be opened with AutoSave off. For a workbook that six people poke at all day, it is the calmer home.
If the file that keeps colliding is a business-critical one — the accounts workbook, the job sheet — that is worth a proper look at how the office shares it, and it is routine work for us: one remote session, while you watch.
/05 — THE COPIES IT LEAVES
What to do with the “conflict” copies afterwards
After a collision you will often find two files where there was one: the original, and a copy whose name has your computer’s name or the word conflict added to the end. OneDrive made it deliberately, to keep both versions rather than guess. It is not a fault; it is the safety net working.
Open both, decide which is right — or merge them — and delete the other. Do it soon: left for a month, nobody remembers which was which, and the office ends up with two half-right versions of the same document being edited by different people. If you find a lot of them, that is a sign that one of the causes in section 02 is still in play, and the fix is the habit, not the tidy-up.
Version history is your friend here too. Right-click a file in OneDrive and choose Version history and you can see and restore earlier saves, which is a calmer way to recover a lost paragraph than comparing conflict copies by eye.
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
Have I lost my work?
No. The version on your screen is still there until you close it, which is why the first step is to save a copy to the Desktop with a new name before doing anything else. The other version is in OneDrive, and its version history holds earlier saves too. Between the three, nothing is gone.
Which copy should I keep?
Open both. If one simply has more of the recent work, keep that one. If each has changes the other lacks — yours and a colleague’s — keep both and merge by hand, or accept Office’s offer to keep both and merge later. Keeping both is never the wrong choice; overwriting is the one to avoid.
It says another user changed the file, but nobody else has it
The other user is usually you on another device, or OneDrive itself replaying an earlier save from a laptop that was offline. Occasionally it is a colleague who opened a copy from an email. Check the version history in OneDrive: it names who saved what and when.
Does this mean the file is corrupt?
No. A merge error is a disagreement between two versions, not damage to either. Genuinely damaged Office files produce a different, more dramatic message about the file being unreadable. If you ever see that one, stop and ring us before trying repairs; version history usually has a clean copy from before it happened.
It happens on every file, every time I save
Then the collision is in Office’s local cache rather than in your documents. Save your open work, close every Office program, clear the document cache using the option under File, Options, Save, then pause and resume OneDrive. If it persists after that, sign out of OneDrive and back in, or ring us and we will do it with you.
// Still stuck?
Still getting the merge error every time you save?
We sort OneDrive and Office sync for homes and businesses across Bournemouth, Poole and Dorset — usually remotely, in one short session. Call 01202 775566.
We’ll fix it with you
- Checking the problem is free
- Fixes from £20, agreed before we start
- We phone first, and you watch every step
Stop it happening again
- A full service every six weeks, written up
- Every program kept up to date
- Unlimited remote help when you need it
Plans from £18.25 a month per computer · cancel any time
Mon–Fri 9–5 · family-run since 1995 · rated 4.9 on GoogleMicrosoft 365 support →