Dropbox uses a “conflicted copies” system when more than one person is working on the same file (or when the same user has a single document open in two locations). Changes to the file aren’t automatically merged together by Dropbox; instead, it keeps two separate copies of the file for the user to merge or remove as required. Writer Bio
