Can't Update Text via Conflict Admin
While this was actually as designed, the fact that the text content shown on the URL Conflicts admin page is read-only makes it VERY difficult to update the text of a node we want to keep if it's not the live node. Currently we have to copy the text into an off-site text document, delete or rename the conflicting pages, visit the now-visible page, and paste the text into it. This is a risky method, since the source pages are already removed and we could potentially be relying only on the clipboard and in the mean time accidentally copy something else and lose our clipboard data.
Fixed in the next release. The text content on the URL Conflicts form will be editable in the next release, and it should be saved as a new revision if changes are applied.