[client] Handle a merge error.