slider
merge conflict fix