wow fight to the death
fixed merge error