properly track conflicts during import