up config
fix conflict