updated slider
merge conflict
merge conflicts