Update jquery.smslider.min.js

remove merge conflicts