**Main Story****Task**
There is another approach on how to handle the edit conflict set up which picks up- When users click on the changed paragraph layout.pen symbol, The screenshots below should give an idea of the rough build.replace the box by an editor so that users can change the content
having checkboxes or switch buttons helps the user- Change the type font in the non-selected box to remind to take care of all conflicting parts.be the same as in the editor, The familiar layout might also help to easier navigate throughso the lines stay the page.
{F10903256}same
{F10903266}
**Task**- The editor can be closed by clicking on the "Leave editor" button. The boxes will be text boxes again (with the usual font), only that the text in the selected box is now changed according to what was changed in editor mode
Is it possible to switch from a changed paragraph box to an editor box and then save the changes which were made?- When the page is saved, the selected changed version is saved.
**Mock**
There would be a different workflow for non javascript users, e.g. first checking boxes, then having the editor box next to the changes, similar to the surrent 2 Column Conflict tool.ODO ADD HERE