If two people or computers change the same file at the same time, Dropbox won't try to merge the changes. Instead, it will save two versions of the file and label one a "conflicted copy." This way, all changes will be preserved and nobody will overwrite another person's hard work.

The name of the second version will be the same as the first but appended with "conflicted copy," the name of the person or computer responsible, and the date that the conflict occurred.

If you find a conflicted file in your shared folder, you may want to discuss which changes to keep with your friend or teammate.