application-pro-dialogs-edit-conflict-dialog
Edit conflict dialog with a three column yours versus theirs field diff, a radio list of resolutions, and a version history safety note.