fix conflict from migration attempt