merge with no-ff
add xie zuo test