Update slider
merge conflict