SENDIASS Workshop: Conflict Resolution