Client teardown finished
Conflict resolution