Client Conflict Resolution