Update import script to support ID conflicts