edited school class
conflict resolution