Fix Conflict
Validate date and time