Adds noConflict feature - Issue #1