config
fix conflict