Update noConflict() method