Removed: noConflict call