Implemented the noConflict API. Fixes #671