Clarify import conflict semantics.
Merge pull request #938 from alexrp/master

Clarify import conflict semantics.