Stop getting an error because of tasks
Merge conflicts