For back-and-forth disagreements in wiki editing, see Edit war.
For dealing with edit conflicts on English Wikipedia, see Help:Edit conflict
A representation of an edit conflict. To resolve the conflict, the goat lover must choose whether to keep their changes or merge them with the cat lover's.
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.