update config
fix conflict