add ShouLi
merge with no-ff