 Complete the following phrase:  By 693, the raids had largely subsided as the Qays reconciled with the Umayyads and were incorporated into the state. The Umayyads attempted to balance the powers and privileges of both factions, but the rivalry smoldered until the third civil war fitna in the caliphate, in which the Yaman killed Caliph Walid II for his dependence on the Qays. Yamani opposition continued under Caliph Marwan II, and the Yaman ultimately defected to the Abbasids when the 