fixed datepicker conflict