fix error in migration
fix conflict error