client merge