Fix leftover conflicts; Merge old cp_get_tasks() with new.