noConflict function added with tests and docs