merge slick/slick