Steps to Reproduce:

• Create an edit conflict by editing the same page at the same place on the same revision with two different accounts/browsers/in private mode.
• While resolving the conflict do another edit on the page at the same place with a different accounts/browsers/in private mode.
• Submit the resolved first conflict

Actual Results:

• You'll see a second conflict resolution screen to resolve the conflict between the first resolved version and the third edit
• The other side of the conflict does not show the content of the third edit
• The your side of the conflict does not show the content of the resolved version
• The selection for one of the sides is remembered from the first interface

Expected Results:

• The other side of the conflict shows the content of the third edit
• The your side of the conflict shows the content of the resolved version
• The selection is set to default

Note: If the third edit does not conflict with any part of the resolved conflict the situation is resolved automatically.