An edit conflict, in the context of wikis, occurs when one user attempts to edit a page, but upon trying to save the new version, another user has already modified the article in the intervening time period, thus causing a difference between the attempted edit and the already-made edit that must be resolved manually. A similar problem can occur when two or more users simultaneously edit the same file in a revision control system that does not have file locking.