Managing Client Conflicts