trying to fix the scheduler
solve conflict