added slider
fixed merge