Add noConflict call