remove ancestry nested resources
Remove ancestry and associated nested tasks
clean up after ancestry
resolve merge conflict
pulled from master and resolved merge conflicts
resolving merge conflicts
tasks feature working, tests pass
resolving merge conflict
subtasks can be created
add full featured subtasks
resolve merge conflicts