remove noconflict

remove noconflict