We study the role of the strange quark mass in color-flavor locked matter. An effective interaction between kaons and particle-hole excitations near the Fermi surface is important and should be included in the effective Lagrangian. The new picture is based on the reasonable assumption of quark-hadron continuity. For a nonzero strange-quark mass, there is the possibility that both antikaon and kaon condensates may occur at different densities. A novel phase diagram of high-density QCD is given, which is different from that given in previous literature. The implications of the configuration are discussed briefly.