Fix typo & restore old ns

* the `noConflict` method was called `noConfict`
* old state would have been discarded, not restored