--- resource_conflict.module	2010-01-19 21:55:49.000000000 -0600
+++ resource_conflictNew.module	2010-02-02 10:48:40.000000000 -0600
@@ -82,8 +82,14 @@ function _resource_conflict_display_conf
     foreach ($conflicting_resources as $conflicting_resource) {
       $date_field = variable_get('rc_date_field_'. $conflicting_node->type, FALSE);
       if (strpos($date_field, 'field_', 0) === 0) {
-        $start = format_date(date_convert($conflicting_node->{$date_field}[0]['value'], DATE_ISO, DATE_UNIX));
-        $end   = format_date(date_convert($conflicting_node->{$date_field}[0]['value2'], DATE_ISO, DATE_UNIX));
+        $type = DATE_ISO;
+        // If date_start is not in DATE_ISO set the type to DATE_DATETIME.
+        if (!date_is_valid($date_start,DATE_ISO)) {
+          $type = DATE_DATETIME;  
+        }
+        
+        $start = format_date(date_convert($conflicting_node->{$date_field}[0]['value'], $type, DATE_UNIX));
+        $end   = format_date(date_convert($conflicting_node->{$date_field}[0]['value2'], $type, DATE_UNIX));
       }
       else {
         $start = format_date($conflicting_node->event_start);