Update noConflict