When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this:
I don't think this needs a CHANGELOG entry as it's pretty minor.