merge the import re (already in this branch).