I describe my idea here:
dejaoffice.com/forums/showthread.php?3794-Comparison-differences-window-for-conflict-resolution-data-collision-warning