Finish and merge task 1