fixed error caused after merge, missing datepicker