update style include duedate for tasks
resolve merge conflicts