(bug 28287) The "your changes" box for edit conflicts is now read-only. Patch by...