remove some span for *cite
merge & solve conflict