Customer importer
fixed merge issues