Complete task 2 and fix task 1