update datepicker
merge code