Fix migration collisions