add config and clear code
merge
fix error