With Office 2016 and OneDrive for Business, you can co-edit and share documents right from your Office apps like Word, Excel, PowerPoint and Visio. If you sync your files to your computer, OneDrive and Office work together to sync documents and let you work with other people on shared documents at the same time.
Note: To collaborate and share on documents this way, you need a Windows computer running the latest version of Office 2016 (Click-to-run version 16.0.6741.2027 or later) and OneDrive for Business as part of an Office 365 business subscription.
What do I do when I get an Office sync conflict?
This setting is on when you first start using Office 2016 and saving your files in OneDrive for Business. Office 2016 syncs your files for you automatically. Life happens sometimes, though, and conflicts might arise when an Office program stops running unexpectedly or when two people edit something at the same time and something goes wrong.
Set file collaboration and sync conflict settings for the new OneDrive sync client
You can tell OneDrive how to handle sync conflicts if they ever occur:
Right-click the blue OneDrive - <your company> cloud icon in your taskbar notification area, and then select Settings.
(You might need to click the Show hidden icons arrow next to the notification area to see the OneDrive icon.)
Select the Office tab.
To stop using Office 2016 to sync Office files, clear the Use Office 2016 to sync files that I have open check box.
Note: If you turn off the Use Office 2016 to sync files that I have open setting, any changes that you and other people make to Office files will no longer merge together automatically. You will also no longer be able to share a document directly from the Office apps.
Under Sync conflicts, choose one of the following settings:
Let me choose to merge changes or keep both copies This means that for an Office file (Word, Excel, PowerPoint or Visio) the OneDrive sync client will ask you if you would rather keep both copies of the file or open the file in Office to merge the changes.
Always keep both copies (rename the copy on this computer) This option automatically keeps both copies of the file under different names.