TwoColConflict seems to perform slightly better than the current conflict resolution page, but especially when you see it for the first time, it still has some usability issues. Therefore we want to find out if this new approach would be better after all.
The idea of this approach is to have a more familiar layout, since it resembles more the diff page. Having switch buttons helps the user remember to take care of all conflicting parts.
The screenshots below should give an idea of the rough build.
The goal of this protoype is mainly to find out that there really are no big technical hurdles in this approach. If that is true, we would like to have a test page setup the same way we have it for TwoColConflict.