fixed date scroll option
js
fixed merge conflict