update to morris.js conflict