Explicitly yeild tasks containing subtasks to add docs and remove ugly code.
solve conflict