change school db
fix conflict