fix the merge... use the correct version of migration