add config
fix conflict