[importer] Fix DataImport after merge conflict