Student Context Helps Resolve Conflict