Added error on failed import resolution.
Performance improvements
Fixed reporting of false conflicts.