Fixed overlap issue and edgecases for overdue tasks
Merge conflicts resolved