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:

      
  1.           Right-click the blue OneDrive - <your company> cloud icon  OneDrive for Business  in your taskbar notification area, and then select Settings.
              OneDrive for Business sync client
              (You might need to click the Show hidden icons arrow next to the notification area to see the OneDrive icon.)
                      
  2.               Select the Office tab.
              Screenshot of the Office tab in Settings for the new OneDrive for Business sync client
                      
  3.                 To stop using Office 2016 to sync Office files, clear the Use Office 2016 to sync files that I have open check box.



Click here for more details