Slick now enabled
Merging