edit due date bug
fix conflict