We used a tour for the beta version to explain the interface. This helped just to some degree. Some things were forgotten when the actual task/decision to make came up.
From a UX perspective it is recommended to guide through the actual site layout and let the make decisions and undestand the interface step by step. Therefore we set up a tour.
1. It should be definitely clear the user is in an edit conflict and not some kind of preview. Therefore we show an overlay explaining the situation. The window can be hidden for future edit conflicts.
2. We highlight interactive/decision spots step by step. The chosen pattern builds on the current behaviour of the Visual editor.
We still have a question mark/help icon in the upper right corner to review the tutorial. This should start everything over again, beginning with the slide.
**NB: For the prototype, we do not need the "don't show this info again" button. Always show the tour**