Remove material, handout and deliverable from tasks; add more scenarios to create task feature
Fix conflict