When two people edit the same Word document stored in OneDrive, a conflict can occur. By default, Word prompts you to choose which version to keep. This interruption slows down collaborative editing and can lead to lost work if you pick the wrong file. The feature that controls this behavior is called AutoSave conflict resolution.
Word uses a merge algorithm to combine changes from multiple authors. When it cannot merge automatically, it asks you to resolve the conflict manually. This article explains how to configure Word to resolve these conflicts automatically without showing any prompt.
You will learn the exact setting to change, the prerequisite conditions required, and what happens when automatic resolution fails. After following these steps, Word will silently merge changes or keep the server version without asking for your input.
Key Takeaways: Automatic Conflict Resolution in Word for OneDrive
- File > Options > Save > Offline conflict resolution for locally cached files: Changing this setting from “Ask me to merge changes” to “Let me merge changes later” or “Always keep the server version” stops the prompt.
- AutoSave must be on: Automatic conflict resolution only works when AutoSave is enabled for the document. Without AutoSave, Word treats the file as a local copy and prompts for every conflict.
- Always keep the server version: Choosing this option discards all local changes when a conflict occurs. Use this only if you are certain your edits are less important than server changes.
How Word Handles OneDrive Conflicts and Why Prompts Appear
Word stores a locally cached copy of every OneDrive file you open. When you save, Word sends your changes to the server. If another person saves changes between your open and your save, the server has a newer version than your local cache. This is a conflict.
Word’s default behavior is to stop and show a dialog box titled “Conflict Resolution.” This dialog lists the server version and your local version. You must click one of three buttons: “Keep the server version,” “Keep my version,” or “Merge changes.” Until you respond, the document remains unsaved and locked for other users.
The root cause of the prompt is the setting Offline conflict resolution for locally cached files. This setting controls what Word does when it detects a conflict with a file that has a local cache. The default option, “Ask me to merge changes,” always shows the prompt. Changing this option to “Let me merge changes later” or “Always keep the server version” removes the prompt entirely.
Automatic resolution also depends on AutoSave being turned on. AutoSave continuously syncs your changes to OneDrive every few seconds. When AutoSave is off, Word treats the file as a traditional local document and does not attempt automatic conflict resolution. The prompt will appear every time.
Steps to Configure Automatic OneDrive Conflict Resolution Without Prompt
Follow these steps to stop Word from asking you to resolve conflicts manually. The procedure is the same in Word for Microsoft 365, Word 2021, and Word 2019. Windows 11 and Windows 10 users follow identical steps.
- Open Word Options
Launch Word. Click the File tab in the upper-left corner. In the backstage view, click Options at the bottom of the left-hand menu. The Word Options dialog box opens. - Navigate to the Save category
In the Word Options dialog, click Save in the left sidebar. This page contains all settings related to file saving, AutoSave, and conflict resolution. - Locate the conflict resolution setting
Scroll down to the section labeled Offline conflict resolution for locally cached files. This section appears near the bottom of the Save page, below the AutoSave settings. - Choose the automatic resolution option
Click the dropdown menu under the section title. You see three options:
– Ask me to merge changes (default – shows the prompt)
– Let me merge changes later (saves the conflict as a separate copy without prompting)
– Always keep the server version (discards local changes and uses the server version)
Select either Let me merge changes later or Always keep the server version to stop the prompt. - Confirm and close
Click OK at the bottom of the Word Options dialog. The setting takes effect immediately. No restart is required.
After completing these steps, Word will no longer display the conflict resolution dialog when a conflict occurs. If you chose Let me merge changes later, Word creates a copy of the conflicting version in your local cache. You can merge these changes later by opening the file and clicking the Compare button on the Review tab. If you chose Always keep the server version, your local changes are lost silently.
What Happens When Automatic Resolution Fails or Cannot Apply
The automatic conflict resolution setting applies only to files that are cached locally. It does not apply to files opened directly from a web browser via Word for the web. It also does not apply to files stored on SharePoint Server 2019 or earlier versions that do not support the modern sync engine.
“Word still prompts for conflict resolution after changing the setting”
This happens when AutoSave is turned off for the specific document. Automatic conflict resolution requires AutoSave to be active. Check the AutoSave toggle in the upper-left corner of the Word window. If it says “AutoSave Off,” click the toggle to turn it on. The file must be saved to OneDrive or SharePoint for AutoSave to work. If the file is stored locally, AutoSave is unavailable, and conflict resolution will always prompt.
“I chose ‘Always keep the server version’ but my changes disappeared”
This is by design. When you select “Always keep the server version,” Word discards any local changes that conflict with the server version. This prevents data loss on the server side but can cause you to lose unsaved work. If you need to keep your local changes, use “Let me merge changes later” instead. That option saves your changes as a separate file that you can review and merge manually.
“The ‘Let me merge changes later’ option created a duplicate file”
Word creates a copy of the conflicting version in a hidden folder under your OneDrive cache. This copy is not visible in File Explorer by default. To merge the changes, open the original document in Word. Click the Review tab, then click Compare and select Combine. Browse to the conflict copy (usually named with a timestamp) and merge it into the main document. After merging, delete the conflict copy to avoid confusion.
Word Conflict Resolution: Prompt vs Automatic vs Server-Only
| Feature | Ask Me to Merge Changes (Prompt) | Let Me Merge Changes Later | Always Keep the Server Version |
|---|---|---|---|
| User prompt | Shows dialog every conflict | No prompt | No prompt |
| Local changes saved | Yes, after you choose merge | Yes, as a separate copy | No, local changes discarded |
| Server version priority | You decide each time | Server version saved; local copy stored | Server version always wins |
| Manual merge required | No, resolved immediately | Yes, later via Compare tool | No |
| Best for | Single-editor documents with rare conflicts | Collaborative documents where you want to review changes later | Read-only or reference documents where you never edit |
This table compares the three conflict resolution behaviors available in Word. Choose based on how you collaborate and whether you need to preserve local edits.
You can now configure Word to resolve OneDrive conflicts automatically without any prompt. Use Let me merge changes later when you want to keep your edits and review them later. Use Always keep the server version when you trust the server copy and do not need your local changes. Remember that AutoSave must be on for these settings to work. If you work in a team that frequently edits the same document, consider enabling version history in OneDrive to recover any lost changes.