Resolve migration
Temporary fix
Skip migration