fix slider always on auto play
fix merge conflicts