noConflict mode added