fix scope push/pop pair
Merge base class member imports
Port Import::importScope