Changed to datepicker and timepicker
Fix Conflicts