update noconflict