Motivation
Tests showed that users are not interested in seeing all version history info when dissolving edit conflicts. Instead, they just want to know why the changes happened (aka edit summary) and who to contact (aka user name)
Task
Adapt the text as visible in the screenshot: