Resolve migration version clash