added stops importer
removed conflict