migrated heat schedules to admin side
pull conflict resolution