We want to know how often users successfully resolve an edit conflict with the new form. For now this should be done by counting how often users used the save button on the edit conflict screen. To get comparable results this should be measured on the two column conflict screen and the old conflict screen.
Also it should be tracked if the users changed the text in the editor before saving. This is done to see if users use the save button to "skip" the conflict resolution and do not actively solve it.