fixed slider and parse update
merger conflict