removed winston
fixed conflict [ci skip]