If a merge conflict arises during editing on the webeditor, it should be possible to resolve the issue in the GUI