merge
clean and add Tasklist