delete error conf
fix conflict