underscore conflict fix