text: An edit conflict is a computer problem that may occur when multiple editors edit the same file and cannot merge without losing part or all of their edit. The conflict occurs when an editor gets a copy of a shared document file, changes the copy, and attempts to save the changes to the original file, which has been altered by another editor after the copy was obtained.
  Resolution
  The simplest way to resolve an edit conflict is to ignore intervening edits and overwrite the current file. This may lead to a substantial loss of information, and alternative methods are often employed to resolve or prevent conflicts:
  Manual resolution, where the editor determines which version to retain and may manually incorporate edits into the current version of the file.