update migrate and models
fix conflict