Changes to import script and indexing
Fixing conflicts