fix config
fix conflict