Tasks now appear
Conflict Fixed