fix migration
fix merge