improved slider
fixed merge
merge
fix merge