Added a comment
Fixed merge conflict. Refactored slider code