Fix migration version numbers after merge