Changed directive for slides
Fixed merge