latest version of winston-splnkstrm
merge conflict