Remove noConflict
Remove noConflict