[client] Improve case conflict handling.