Fix migration id clash after merge