MAP-431: Conflict Resolution Error Text Revision