noconflict update