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 latter conquered the Umayyad realm in 750. The Yaman and Qays briefly joined forces against the Abbasids later that year, but were defeated. The Qays–Yaman rivalry diminished significantly under the Abbasids who, unlike the Umayyads, did not derive the bulk of their military support from either faction. Nonetheless, the feud persisted at the local level to varying degrees in the following centuries, which saw occasional outbreaks of Qaysi–Yamani violence.