Fixing noConflict()