Fix resolve_conflicts to avoid rutime warnings

program/models.py

@@ -995,7 +995,8 @@ class Schedule(models.Model):
 
         # Collect upcoming timeslots to delete which might still remain
         del_timeslots = TimeSlot.objects.filter(
-            schedule=schedule, start__gt=schedule.last_date
+            schedule=schedule,
+            start__gt=timezone.make_aware(datetime.combine(schedule.last_date, time(0, 0)))
         )
         for del_ts in del_timeslots:
             delete.append(del_ts)