Improved Unicode highlighting for manual conflict assignment.