Conflict Resolution/Management by Athena in a Crowd