datepicker update
fix detached head
fix merge conflicts